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

List:       kde-commits
Subject:    branches/kdevelop/3.4
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2007-02-01 17:32:09
Message-ID: 1170351129.675081.29480.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 629164 by apaku:

Fix crashes when --profile is used without a valid profile name


 M  +3 -1      parts/snippet/snippet_widget.cpp  
 M  +6 -3      src/plugincontroller.cpp  


--- branches/kdevelop/3.4/parts/snippet/snippet_widget.cpp #629163:629164
@@ -71,7 +71,7 @@
     connect( this, SIGNAL( dropped(QDropEvent *, QListViewItem *) ),
              this, SLOT( slotDropped(QDropEvent *, QListViewItem *) ) );
 
-    _cfg = NULL;
+    _cfg = 0;
 
     QTimer::singleShot(0, this, SLOT(initConfig()));
 }
@@ -309,6 +309,8 @@
  */
 void SnippetWidget::writeConfig()
 {
+  if( !_cfg )
+    return;
   _cfg->deleteGroup("SnippetPart");  //this is neccessary otherwise delete entries \
                will stay in list until
                                      //they get overwritten by a more recent entry
   _cfg->setGroup("SnippetPart");
--- branches/kdevelop/3.4/src/plugincontroller.cpp #629163:629164
@@ -100,10 +100,13 @@
 
 	QStringList disableList;
 	Profile * profile = engine().findProfile( currentProfile() );
-	Profile::EntryList disableEntryList = profile->list( Profile::ExplicitDisable );
-	for ( Profile::EntryList::const_iterator it = disableEntryList.constBegin(); it != \
disableEntryList.constEnd(); ++it ) +	if( profile )
 	{
-		disableList << (*it).name;
+		Profile::EntryList disableEntryList = profile->list( Profile::ExplicitDisable );
+		for ( Profile::EntryList::const_iterator it = disableEntryList.constBegin(); it != \
disableEntryList.constEnd(); ++it ) +		{
+			disableList << (*it).name;
+		}
 	}
 	loadGlobalPlugins( disableList );
 }


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