diff options
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 53 |
1 files changed, 12 insertions, 41 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index f06669d5c5..0f6a856bd2 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -319,44 +319,8 @@ void RbUtilQt::completeInstall() | |||
319 | logger = new ProgressLoggerGui(this); | 319 | logger = new ProgressLoggerGui(this); |
320 | logger->show(); | 320 | logger->show(); |
321 | 321 | ||
322 | QString mountpoint = userSettings->value("mountpoint").toString(); | 322 | if(smallInstallInner()) |
323 | // show dialog with error if mount point is wrong | ||
324 | if(!QFileInfo(mountpoint).isDir()) { | ||
325 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); | ||
326 | logger->abort(); | ||
327 | return; | 323 | return; |
328 | } | ||
329 | // Bootloader | ||
330 | devices->beginGroup(userSettings->value("platform").toString()); | ||
331 | if(devices->value("needsbootloader", "") == "yes") { | ||
332 | m_error = false; | ||
333 | m_installed = false; | ||
334 | if(!installBootloaderAuto()) | ||
335 | return; | ||
336 | else | ||
337 | { | ||
338 | // wait for boot loader installation finished | ||
339 | while(!m_installed) | ||
340 | QApplication::processEvents(); | ||
341 | } | ||
342 | if(m_error) return; | ||
343 | logger->undoAbort(); | ||
344 | } | ||
345 | devices->endGroup(); | ||
346 | |||
347 | // Rockbox | ||
348 | m_error = false; | ||
349 | m_installed = false; | ||
350 | if(!installAuto()) | ||
351 | return; | ||
352 | else | ||
353 | { | ||
354 | // wait for installation finished | ||
355 | while(!m_installed) | ||
356 | QApplication::processEvents(); | ||
357 | } | ||
358 | if(m_error) return; | ||
359 | logger->undoAbort(); | ||
360 | 324 | ||
361 | // Fonts | 325 | // Fonts |
362 | m_error = false; | 326 | m_error = false; |
@@ -406,12 +370,17 @@ void RbUtilQt::smallInstall() | |||
406 | logger = new ProgressLoggerGui(this); | 370 | logger = new ProgressLoggerGui(this); |
407 | logger->show(); | 371 | logger->show(); |
408 | 372 | ||
373 | smallInstallInner(); | ||
374 | } | ||
375 | |||
376 | bool RbUtilQt::smallInstallInner() | ||
377 | { | ||
409 | QString mountpoint = userSettings->value("mountpoint").toString(); | 378 | QString mountpoint = userSettings->value("mountpoint").toString(); |
410 | // show dialog with error if mount point is wrong | 379 | // show dialog with error if mount point is wrong |
411 | if(!QFileInfo(mountpoint).isDir()) { | 380 | if(!QFileInfo(mountpoint).isDir()) { |
412 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); | 381 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); |
413 | logger->abort(); | 382 | logger->abort(); |
414 | return; | 383 | return true; |
415 | } | 384 | } |
416 | // Bootloader | 385 | // Bootloader |
417 | devices->beginGroup(userSettings->value("platform").toString()); | 386 | devices->beginGroup(userSettings->value("platform").toString()); |
@@ -419,14 +388,14 @@ void RbUtilQt::smallInstall() | |||
419 | m_error = false; | 388 | m_error = false; |
420 | m_installed = false; | 389 | m_installed = false; |
421 | if(!installBootloaderAuto()) | 390 | if(!installBootloaderAuto()) |
422 | return; | 391 | return true; |
423 | else | 392 | else |
424 | { | 393 | { |
425 | // wait for boot loader installation finished | 394 | // wait for boot loader installation finished |
426 | while(!m_installed) | 395 | while(!m_installed) |
427 | QApplication::processEvents(); | 396 | QApplication::processEvents(); |
428 | } | 397 | } |
429 | if(m_error) return; | 398 | if(m_error) return true; |
430 | logger->undoAbort(); | 399 | logger->undoAbort(); |
431 | } | 400 | } |
432 | devices->endGroup(); | 401 | devices->endGroup(); |
@@ -435,13 +404,15 @@ void RbUtilQt::smallInstall() | |||
435 | m_error = false; | 404 | m_error = false; |
436 | m_installed = false; | 405 | m_installed = false; |
437 | if(!installAuto()) | 406 | if(!installAuto()) |
438 | return; | 407 | return true; |
439 | else | 408 | else |
440 | { | 409 | { |
441 | // wait for installation finished | 410 | // wait for installation finished |
442 | while(!m_installed) | 411 | while(!m_installed) |
443 | QApplication::processEvents(); | 412 | QApplication::processEvents(); |
444 | } | 413 | } |
414 | |||
415 | return false; | ||
445 | } | 416 | } |
446 | 417 | ||
447 | void RbUtilQt::installdone(bool error) | 418 | void RbUtilQt::installdone(bool error) |