Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-09 01:25:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed crash in settings "IP Filters" when removing the last row of whitelist or blacklist.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8353 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-06-03 14:35:14 +00:00
parent 7bb30921a1
commit 5fd9ab59d7
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
retroshare-gui/src/gui/settings/ServerPage.cpp
View file

@ -389,7 +389,11 @@ void ServerPage::loadFilteredIps()
} }
void ServerPage::updateSelectedBlackListIP(int row,int,int,int) 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 ; sockaddr_storage addr ;
int masked_bytes ; int masked_bytes ;
@ -406,7 +410,12 @@ void ServerPage::updateSelectedBlackListIP(int row,int,int,int)
} }
void ServerPage::updateSelectedWhiteListIP(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 ; sockaddr_storage addr ;
int masked_bytes ; int masked_bytes ;

2
retroshare-gui/src/gui/settings/ServerPage.ui
View file

@ -17,7 +17,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">