[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kinit
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-03-05 14:41:12
Message-ID: 20040305144112.C2E81995A () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

*) Don't loop restarting klauncher when dcopserver dies.
*) Don't core dump when dcopserver isn't there at startup.


  M +2 -1      kinit.cpp   1.137
  M +1 -1      klauncher_main.cpp   1.35


--- kdelibs/kinit/kinit.cpp  #1.136:1.137
@@ -1017,4 +1017,5 @@ static void launcher_died()
    }
 
+   d.launcher_ok = false;
    d.launcher_pid = 0;
    close(d.launcher[0]);

--- kdelibs/kinit/klauncher_main.cpp  #1.34:1.35
@@ -74,5 +74,5 @@ extern "C" int kdemain( int argc, char**
       if (dcopName.isEmpty())
       {
-         kdFatal() << "DCOP communication problem!" << endl;
+         kdWarning() << "DCOP communication problem!" << endl;
          return 1;
       }


[prev in list] [next in list] [prev in thread] [next in thread]