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

List:       kde-commits
Subject:    branches/work/icecream/client
From:       Michael Matz <matz () kde ! org>
Date:       2006-05-22 15:16:43
Message-ID: 1148311003.895235.5538.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 543674 by matz:

Don't SEGV.


 M  +2 -2      main.cpp  


--- branches/work/icecream/client/main.cpp #543673:543674
@@ -170,7 +170,7 @@
 
     local |= analyse_argv( argv, job );
 
-    MsgChannel *local_daemon = Service::createChannel( "127.0.0.1", 10245, 0); // 0 == no timeout
+    MsgChannel *local_daemon = Service::createChannel( "127.0.0.1", 10245, 0/*timeout*/);
     if ( ! local_daemon ) {
         log_warning() << "no local daemon found\n";
         return build_local( job, 0 );
@@ -194,7 +194,7 @@
 
             // the timeout is high because it creates the native version
             Msg *umsg = local_daemon->get_msg(4 * 60);
-            trace() << "sent " << ( char )umsg->type << endl;
+            trace() << "sent " << umsg ? ( char )umsg->type : -1 << endl;
             if ( !umsg || umsg->type != M_NATIVE_ENV ) {
                 delete local_daemon;
                 return build_local( job, 0 );
[prev in list] [next in list] [prev in thread] [next in thread]