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

List:       kde-commits
Subject:    [digikam] /: prevent a possible crash in QHash
From:       Maik Qualmann <null () kde ! org>
Date:       2017-01-31 21:27:52
Message-ID: E1cYfxw-0002eg-H4 () code ! kde ! org
[Download RAW message or body]

Git commit 96aff529e8d6d3fc7ac358d38e0186cf86208c0e by Maik Qualmann.
Committed on 31/01/2017 at 21:26.
Pushed by mqualmann into branch 'master'.

prevent a possible crash in QHash
BUGS: 375591
FIXED-IN: 5.5.0

M  +2    -1    NEWS
M  +2    -0    libs/album/albummanager.cpp

https://commits.kde.org/digikam/96aff529e8d6d3fc7ac358d38e0186cf86208c0e

diff --git a/NEWS b/NEWS
index 3845bdb461..c259833abf 100644
--- a/NEWS
+++ b/NEWS
@@ -51,4 +51,5 @@ BUGFIXES FROM BUGZILLA:
 039 ==> 291110 - BQM Watermark tool : size original/unchanged/pixels/points.
 040 ==> 375767 - In Editor switching between pictures with left/right key is \
reversed. Pic 1 of 80 is displayed as 80 of 80.  041 ==> 375770 - Creating tag from \
                left panel causes error.
-042 ==> 
+042 ==> 375591 - Digikam crash.
+043 ==> 
diff --git a/libs/album/albummanager.cpp b/libs/album/albummanager.cpp
index 78ac4cf449..4884215136 100644
--- a/libs/album/albummanager.cpp
+++ b/libs/album/albummanager.cpp
@@ -1592,6 +1592,8 @@ void AlbumManager::scanTAlbums()
             }
         }
 
+        tagHash.clear();
+
         // now insert the items into the list. becomes sorted
         AlbumIterator it(rootTag);
 


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