From 1b637754fa8b49dd189e2124ca4a220af8f7d718 Mon Sep 17 00:00:00 2001 From: Dominik Wenger Date: Sun, 6 Apr 2008 19:39:41 +0000 Subject: rbutil: fix complete install: make sure signals are connected before calling the function emiting the signal. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16995 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/rbutilqt.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 71415d7..9253205 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -470,10 +470,10 @@ bool RbUtilQt::installAuto() if(!settings->cacheDisabled()) installer->setCache(true); installer->setMountPoint(settings->mountpoint()); - installer->install(logger); connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); + installer->install(logger); return true; } @@ -606,7 +606,7 @@ void RbUtilQt::installFontsBtn() bool RbUtilQt::installFontsAuto() { installFonts(); - connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); + return !m_error; } @@ -621,6 +621,8 @@ void RbUtilQt::installFonts() installer->setMountPoint(settings->mountpoint()); if(!settings->cacheDisabled()) installer->setCache(true); + + connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); installer->install(logger); } @@ -682,7 +684,6 @@ void RbUtilQt::installDoomBtn() bool RbUtilQt::installDoomAuto() { installDoom(); - connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); return !m_error; } @@ -703,6 +704,7 @@ void RbUtilQt::installDoom() installer->setMountPoint(settings->mountpoint()); if(!settings->cacheDisabled()) installer->setCache(true); + connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); installer->install(logger); } -- cgit v1.1