summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Wenger <domonoky@googlemail.com>2008-04-06 19:39:41 +0000
committerDominik Wenger <domonoky@googlemail.com>2008-04-06 19:39:41 +0000
commit1b637754fa8b49dd189e2124ca4a220af8f7d718 (patch)
tree8e96159581dee4556418da35056fcfc0ee09b755 /rbutil
parenta0e6641c10955835821931b315950611595834de (diff)
downloadrockbox-1b637754fa8b49dd189e2124ca4a220af8f7d718.tar.gz
rockbox-1b637754fa8b49dd189e2124ca4a220af8f7d718.tar.bz2
rockbox-1b637754fa8b49dd189e2124ca4a220af8f7d718.zip
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
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 71415d70eb..92532059fb 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);
}