1 files changed, 7 insertions, 1 deletions
diff --git a/kcontrol/input/tdesyndaemon.cpp b/kcontrol/input/tdesyndaemon.cpp
index 46b6d1c92..2be3e992c 100644
--- a/kcontrol/input/tdesyndaemon.cpp
+++ b/kcontrol/input/tdesyndaemon.cpp
@@ -42,7 +42,7 @@
 #include "tdesyndaemon.h"
 #include "tdesyndaemon.moc"
 
-const unsigned int TDESynDaemon::TIME_OUT = 150;
+const unsigned int TDESynDaemon::TIME_OUT = 300;
 const unsigned int TDESynDaemon::POLL_INTERVAL = 100;
 const unsigned int TDESynDaemon::KEYMAP_SIZE = 32;
 
@@ -194,7 +194,13 @@ extern "C" TDE_EXPORT int main(int argc, char *argv[])
 
     TDEApplication app;
     app.disableSessionManagement();
+    if (app.dcopClient()->isApplicationRegistered("tdesyndaemon"))
+    {
+        kdWarning() << "TDESynDaemon already running, exiting..." << endl;
+        return 255;
+    }
     app.dcopClient()->registerAs("tdesyndaemon", false);
+    app.dcopClient()->setDefaultObject("tdesyndaemon");
 
     TDESynDaemon tdesyndaemon;
     return app.exec();