1 files changed, 72 insertions, 42 deletions

diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 9f611da..e2afada 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -287,8 +287,18 @@ void SettingsImpl :: editServer( int sel )
     currentSelectedServer = sel;
     Server *s = dataMgr->getServer( servers->currentText() );
-    serverName = s->getServerName();
-    servername->setText( s->getServerName() );
-    serverurl->setText( s->getServerUrl() );
-    active->setChecked( s->isServerActive() );
+    if ( s )
+    {
+        serverName = s->getServerName();
+        servername->setText( s->getServerName() );
+        serverurl->setText( s->getServerUrl() );
+        active->setChecked( s->isServerActive() );
+    }
+    else
+    {
+        serverName = "";
+        servername->setText( "" );
+        serverurl->setText( "" );
+        active->setChecked( false );
+    }
 }
 
@@ -306,6 +316,9 @@ void SettingsImpl :: removeServer()
     changed = true;
     Server *s = dataMgr->getServer( servers->currentText() );
-    dataMgr->getServerList().removeRef( s );
-    servers->removeItem( currentSelectedServer );
+    if ( s )
+    {
+        dataMgr->getServerList().removeRef( s );
+        servers->removeItem( currentSelectedServer );
+    }
 }
 
@@ -333,19 +346,20 @@ void SettingsImpl :: changeServerDetails()
 	{
 		Server *s = dataMgr->getServer( servers->currentText() );
-
-		// Update url
-		s->setServerUrl( serverurl->text() );
-        s->setActive( active->isChecked() );
-
-
-		// Check if server name has changed, if it has then we need to replace the key in the map
-		if ( serverName != newName )
+		if ( s )
 		{
-			// Update server name
-			s->setServerName( newName );
-		}
+			// Update url
+			s->setServerUrl( serverurl->text() );
+			s->setActive( active->isChecked() );
+
+			// Check if server name has changed, if it has then we need to replace the key in the map
+			if ( serverName != newName )
+			{
+				// Update server name
+				s->setServerName( newName );
+			}
 		
-		// Update list box
-		servers->changeItem( newName, currentSelectedServer );
+			// Update list box
+			servers->changeItem( newName, currentSelectedServer );
+		}
 	}
 	else
@@ -364,10 +378,20 @@ void SettingsImpl :: changeServerDetails()
 void SettingsImpl :: editDestination( int sel )
 {
-	currentSelectedDestination = sel;
+    currentSelectedDestination = sel;
     Destination *d = dataMgr->getDestination( destinations->currentText() );
-    destinationName = d->getDestinationName();
-    destinationname->setText( d->getDestinationName() );
-    destinationurl->setText( d->getDestinationPath() );
-    linkToRoot->setChecked( d->linkToRoot() );
+    if ( d )
+    {
+        destinationName = d->getDestinationName();
+        destinationname->setText( d->getDestinationName() );
+        destinationurl->setText( d->getDestinationPath() );
+        linkToRoot->setChecked( d->linkToRoot() );
+    }
+    else
+    {
+        destinationName = "";
+        destinationname->setText( "" );
+        destinationurl->setText( "" );
+        linkToRoot->setChecked( false );
+    }
 }
 
@@ -385,6 +409,9 @@ void SettingsImpl :: removeDestination()
     changed = true;
     Destination *d = dataMgr->getDestination( destinations->currentText() );
-    dataMgr->getDestinationList().removeRef( d );
-	destinations->removeItem( currentSelectedDestination );
+    if ( d )
+    {
+        dataMgr->getDestinationList().removeRef( d );
+        destinations->removeItem( currentSelectedDestination );
+    }
 }
 
@@ -402,24 +429,27 @@ void SettingsImpl :: changeDestinationDetails()
 	{
 		Destination *d = dataMgr->getDestination( destinations->currentText() );
+		if ( d )
+		{
+			// Update url
+			d->setDestinationPath( destinationurl->text() );
+        	d->linkToRoot( linkToRoot->isChecked() );
 
-		// Update url
-		d->setDestinationPath( destinationurl->text() );
-        d->linkToRoot( linkToRoot->isChecked() );
+			// Check if server name has changed, if it has then we need to replace the key in the map
+			if ( destinationName != newName )
+			{
+				// Update server name
+				d->setDestinationName( newName );
 
-		// Check if server name has changed, if it has then we need to replace the key in the map
-		if ( destinationName != newName )
-		{
-			// Update server name
-			d->setDestinationName( newName );
+				// Update list box
+				destinations->changeItem( newName, currentSelectedDestination );
+			}
 
-			// Update list box
-			destinations->changeItem( newName, currentSelectedDestination );
-		}
 #ifdef QWS
-        QString key = newName;
-        key += "_linkToRoot";
-        int val = d->linkToRoot();
-        cfg.writeEntry( key, val );
-#endif        
+			QString key = newName;
+			key += "_linkToRoot";
+			int val = d->linkToRoot();
+			cfg.writeEntry( key, val );
+#endif      
+		}  
 	}
 	else