From 5fd9ab59d7adf01fec4473c049abb9fb866912e6 Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Wed, 3 Jun 2015 14:35:14 +0000
Subject: [PATCH] Fixed crash in settings "IP Filters" when removing the last
 row of whitelist or blacklist.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8353 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/settings/ServerPage.cpp | 13 +++++++++++--
 retroshare-gui/src/gui/settings/ServerPage.ui  |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index 630cf0b58..94b114454 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -389,7 +389,11 @@ void ServerPage::loadFilteredIps()
 }
 void ServerPage::updateSelectedBlackListIP(int row,int,int,int)
 {
-    QString addr_string = ui.filteredIpsTable->item(row,COLUMN_RANGE)->text() ;
+    QTableWidgetItem *item = ui.filteredIpsTable->item(row,COLUMN_RANGE);
+    if (!item) {
+        return;
+    }
+    QString addr_string = item->text() ;
 
     sockaddr_storage addr ;
     int masked_bytes ;
@@ -406,7 +410,12 @@ void ServerPage::updateSelectedBlackListIP(int row,int,int,int)
 }
 void ServerPage::updateSelectedWhiteListIP(int row, int,int,int)
 {
-    QString addr_string = ui.whiteListIpsTable->item(row,COLUMN_RANGE)->text() ;
+    QTableWidgetItem *item = ui.whiteListIpsTable->item(row,COLUMN_RANGE);
+    if (!item) {
+        return;
+    }
+
+    QString addr_string = item->text() ;
 
     sockaddr_storage addr ;
     int masked_bytes ;
diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui
index edf452e23..02f2c2b4b 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.ui
+++ b/retroshare-gui/src/gui/settings/ServerPage.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">