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-12-23 02:22:59 +0100
commitd7ca37b4b131952f5800d66271ee281c07ee9715 (patch)
tree9ef91096d376811c31bf602d7f925dd235827d9a
parent30c04cf29dd95d01a12ab389d6926f4857b141fd (diff)
downloadtdelibs-d7ca37b4b131952f5800d66271ee281c07ee9715.tar.gz
tdelibs-d7ca37b4b131952f5800d66271ee281c07ee9715.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--kdecore/kuniqueapplication.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/kdecore/kuniqueapplication.cpp b/kdecore/kuniqueapplication.cpp
index 7cd0575cc..e6d801ad4 100644
--- a/kdecore/kuniqueapplication.cpp
+++ b/kdecore/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