diff options
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 13f004de5a..a2ac2b73ea 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -327,6 +327,7 @@ void RbUtilQt::completeInstall() | |||
327 | return; | 327 | return; |
328 | } | 328 | } |
329 | // Bootloader | 329 | // Bootloader |
330 | devices->beginGroup(userSettings->value("platform").toString()); | ||
330 | if(devices->value("needsbootloader", "") == "yes") { | 331 | if(devices->value("needsbootloader", "") == "yes") { |
331 | m_error = false; | 332 | m_error = false; |
332 | m_installed = false; | 333 | m_installed = false; |
@@ -341,7 +342,8 @@ void RbUtilQt::completeInstall() | |||
341 | if(m_error) return; | 342 | if(m_error) return; |
342 | logger->undoAbort(); | 343 | logger->undoAbort(); |
343 | } | 344 | } |
344 | 345 | devices->endGroup(); | |
346 | |||
345 | // Rockbox | 347 | // Rockbox |
346 | m_error = false; | 348 | m_error = false; |
347 | m_installed = false; | 349 | m_installed = false; |
@@ -349,7 +351,7 @@ void RbUtilQt::completeInstall() | |||
349 | return; | 351 | return; |
350 | else | 352 | else |
351 | { | 353 | { |
352 | // wait for boot loader installation finished | 354 | // wait for installation finished |
353 | while(!m_installed) | 355 | while(!m_installed) |
354 | QApplication::processEvents(); | 356 | QApplication::processEvents(); |
355 | } | 357 | } |
@@ -363,7 +365,7 @@ void RbUtilQt::completeInstall() | |||
363 | return; | 365 | return; |
364 | else | 366 | else |
365 | { | 367 | { |
366 | // wait for boot loader installation finished | 368 | // wait for installation finished |
367 | while(!m_installed) | 369 | while(!m_installed) |
368 | QApplication::processEvents(); | 370 | QApplication::processEvents(); |
369 | } | 371 | } |
@@ -379,14 +381,13 @@ void RbUtilQt::completeInstall() | |||
379 | return; | 381 | return; |
380 | else | 382 | else |
381 | { | 383 | { |
382 | // wait for boot loader installation finished | 384 | // wait for installation finished |
383 | while(!m_installed) | 385 | while(!m_installed) |
384 | QApplication::processEvents(); | 386 | QApplication::processEvents(); |
385 | } | 387 | } |
386 | if(m_error) return; | 388 | if(m_error) return; |
387 | } | 389 | } |
388 | 390 | ||
389 | |||
390 | // theme | 391 | // theme |
391 | // this is a window | 392 | // this is a window |
392 | // it has its own logger window,so close our. | 393 | // it has its own logger window,so close our. |
@@ -404,7 +405,7 @@ void RbUtilQt::smallInstall() | |||
404 | // create logger | 405 | // create logger |
405 | logger = new ProgressLoggerGui(this); | 406 | logger = new ProgressLoggerGui(this); |
406 | logger->show(); | 407 | logger->show(); |
407 | 408 | ||
408 | QString mountpoint = userSettings->value("mountpoint").toString(); | 409 | QString mountpoint = userSettings->value("mountpoint").toString(); |
409 | // show dialog with error if mount point is wrong | 410 | // show dialog with error if mount point is wrong |
410 | if(!QFileInfo(mountpoint).isDir()) { | 411 | if(!QFileInfo(mountpoint).isDir()) { |
@@ -413,6 +414,7 @@ void RbUtilQt::smallInstall() | |||
413 | return; | 414 | return; |
414 | } | 415 | } |
415 | // Bootloader | 416 | // Bootloader |
417 | devices->beginGroup(userSettings->value("platform").toString()); | ||
416 | if(devices->value("needsbootloader", "") == "yes") { | 418 | if(devices->value("needsbootloader", "") == "yes") { |
417 | m_error = false; | 419 | m_error = false; |
418 | m_installed = false; | 420 | m_installed = false; |
@@ -427,7 +429,8 @@ void RbUtilQt::smallInstall() | |||
427 | if(m_error) return; | 429 | if(m_error) return; |
428 | logger->undoAbort(); | 430 | logger->undoAbort(); |
429 | } | 431 | } |
430 | 432 | devices->endGroup(); | |
433 | |||
431 | // Rockbox | 434 | // Rockbox |
432 | m_error = false; | 435 | m_error = false; |
433 | m_installed = false; | 436 | m_installed = false; |
@@ -435,7 +438,7 @@ void RbUtilQt::smallInstall() | |||
435 | return; | 438 | return; |
436 | else | 439 | else |
437 | { | 440 | { |
438 | // wait for boot loader installation finished | 441 | // wait for installation finished |
439 | while(!m_installed) | 442 | while(!m_installed) |
440 | QApplication::processEvents(); | 443 | QApplication::processEvents(); |
441 | } | 444 | } |