diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-11-27 06:54:19 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-11-27 06:54:19 +0300 |
| commit | e95da21ecbce8a426b0e9c9d41c8a6333003ce52 (patch) | |
| tree | 35ceddb922570e3497c2397abcb8dd7d5ed51580 /net-p2p | |
| parent | 853bbe88718724c6b1b587c5c2ee8472144676cd (diff) | |
retroshare: potential crash fix in new keyring ui code
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/retroshare/files/keyring_bgcolors+potential_crash_fix.patch (renamed from net-p2p/retroshare/files/keyring_bgcolors_v4.patch) | 21 | ||||
| -rw-r--r-- | net-p2p/retroshare/retroshare-scm.ebuild | 2 |
2 files changed, 21 insertions, 2 deletions
diff --git a/net-p2p/retroshare/files/keyring_bgcolors_v4.patch b/net-p2p/retroshare/files/keyring_bgcolors+potential_crash_fix.patch index 350a342..9ee9631 100644 --- a/net-p2p/retroshare/files/keyring_bgcolors_v4.patch +++ b/net-p2p/retroshare/files/keyring_bgcolors+potential_crash_fix.patch @@ -94,7 +94,7 @@ index 5c73c0a51..0dcdb18b8 100644 { Q_OBJECT diff --git a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp -index 40c29fa4c..1e87bf454 100644 +index 40c29fa4c..3b16dc57e 100644 --- a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp +++ b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp @@ -2,16 +2,14 @@ @@ -166,6 +166,25 @@ index 40c29fa4c..1e87bf454 100644 return QVariant(); } +@@ -300,14 +305,14 @@ void pgpid_item_model::data_updated(std::list<RsPgpId> &new_neighs) + //reflect actual row count in model + if(old_size < new_size) + { +- beginInsertRows(QModelIndex(), old_size - 1, old_size - 1 + new_size - old_size); +- insertRows(old_size - 1 , new_size - old_size); ++ beginInsertRows(QModelIndex(), old_size, new_size); ++ insertRows(old_size, new_size - old_size); + endInsertRows(); + } + else if(new_size < old_size) + { +- beginRemoveRows(QModelIndex(), new_size - 1, new_size - 1 + old_size - new_size); +- removeRows(old_size - 1, old_size - new_size); ++ beginRemoveRows(QModelIndex(), new_size, old_size); ++ removeRows(old_size, old_size - new_size); + endRemoveRows(); + } + //update data in ui, to avoid unnecessary redraw and ui updates, updating only changed elements diff --git a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h index 8dc31d276..75b681ac1 100644 --- a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h diff --git a/net-p2p/retroshare/retroshare-scm.ebuild b/net-p2p/retroshare/retroshare-scm.ebuild index 80bfeb4..e70ffee 100644 --- a/net-p2p/retroshare/retroshare-scm.ebuild +++ b/net-p2p/retroshare/retroshare-scm.ebuild @@ -83,7 +83,7 @@ PATCHES=( "${FILESDIR}/hidden_service.patch" "${FILESDIR}/cflags.patch" "${FILESDIR}/disable_key_array_redraw.patch" - "${FILESDIR}/keyring_bgcolors_v4.patch" + "${FILESDIR}/keyring_bgcolors+potential_crash_fix.patch" ) |