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

List:       kde-commits
Subject:    kdevelop/vcs/cvsservice
From:       Jens Dagerbo <jens.dagerbo () swipnet ! se>
Date:       2005-01-07 20:23:39
Message-ID: 20050107202339.7A3241CEBE () office ! kde ! org
[Download RAW message or body]

CVS commit by dagerbo: 

Should fix the crash when KDevelop can't start the cvsservice DCOP service

BUG: 96545


  M +2 -0      cvspart.cpp   1.51
  M +6 -2      cvspartimpl.cpp   1.31


--- kdevelop/vcs/cvsservice/cvspart.cpp  #1.50:1.51
@@ -115,4 +115,6 @@ CvsServicePart::~CvsServicePart()
 void CvsServicePart::init()
 {
+    if ( !m_impl->m_widget ) return;
+
     setupActions();
 

--- kdevelop/vcs/cvsservice/cvspartimpl.cpp  #1.30:1.31
@@ -81,4 +81,6 @@ CvsServicePartImpl::CvsServicePartImpl( 
         m_scheduler = new DirectScheduler( m_widget );
         m_fileInfoProvider = new CVSFileInfoProvider( part, m_cvsService );
+    
+        connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) );
     }
     else
@@ -88,5 +90,4 @@ CvsServicePartImpl::CvsServicePartImpl( 
     }
 
-    connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) );
 }
 
@@ -952,5 +953,8 @@ void CvsServicePartImpl::slotProjectOpen
         << projectDirectory() << endl;
 
+    if ( m_repository )
+    {
     m_repository->setWorkingCopy( projectDirectory() );
+    }
 }
 


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