summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-05-24 12:02:17 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-05-24 12:11:59 +0200
commita4f6021ace90c97d2fdb4bbad2c3953088068193 (patch)
tree154ce0556a9b4128e6684b45a93205523cc9d7ce
parent1cd9c266d83040143650b0ee3a790cba7296fbbf (diff)
downloadtdelibs-a4f6021ace90c97d2fdb4bbad2c3953088068193.tar.gz
tdelibs-a4f6021ace90c97d2fdb4bbad2c3953088068193.zip
Force to handle DCOP requests in KUniqueApplication (newInstance call)
This resolves Bug 2437 Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit c6c1d781a5035e6740532366a09a48448a93666c)
-rw-r--r--tdecore/kuniqueapplication.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 0a3a0962a..12c9c1297 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -322,9 +322,14 @@ KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool c
d->processingRequest = false;
d->firstInstance = true;
- if (s_nofork)
+ if (s_nofork) {
// Can't call newInstance directly from the constructor since it's virtual...
TQTimer::singleShot( 0, this, TQT_SLOT(newInstanceNoFork()) );
+ }
+ else {
+ // Force to handle DCOP requests (newInstance call)
+ TQTimer::singleShot( 0, this, TQT_SLOT(processDelayed()));
+ }
}
@@ -338,9 +343,14 @@ KUniqueApplication::KUniqueApplication(Display *display, Qt::HANDLE visual,
d->processingRequest = false;
d->firstInstance = true;
- if (s_nofork)
+ if (s_nofork) {
// Can't call newInstance directly from the constructor since it's virtual...
TQTimer::singleShot( 0, this, TQT_SLOT(newInstanceNoFork()) );
+ }
+ else {
+ // Force to handle DCOP requests (newInstance call)
+ TQTimer::singleShot( 0, this, TQT_SLOT(processDelayed()));
+ }
}
#endif