From kde-bugs-dist  Fri Oct 22 18:48:31 2004
From: Joern Ahrens <kde () jokele ! de>
Date: Fri, 22 Oct 2004 18:48:31 +0000
To: kde-bugs-dist
Subject: [Bug 91916] Crash when adding tag in comment/tag dialog
Message-Id: <20041022184831.3087.qmail () ktown ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-bugs-dist&m=109847092015907

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
        
http://bugs.kde.org/show_bug.cgi?id=91916        
kde jokele de changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From kde jokele de  2004-10-22 20:48 -------
CVS commit by jahrens: 

thanks for reporting. fixed in cvs.

BUG: 91916


  M +9 -6      imagedescedit.cpp   1.22
  M +1 -1      imagedescedit.h   1.9


--- kdeextragear-3/digikam/digikam/imagedescedit.cpp  #1.21:1.22
 @ -391,4 +391,5  @ void ImageDescEdit::slotRightButtonClick
     {
         album = AlbumManager::instance()->findTAlbum(0);
+        albumItem = dynamic_cast<TAlbumCheckListItem*>(m_tagsView->firstChild());
     }
     else 
 @ -433,9 +434,5  @ void ImageDescEdit::slotRightButtonClick
     {
         if (!album->isRoot()) 
-        {
-            tagDelete(album);
-            if(albumItem)
-                delete item;
-        }
+            tagDelete(album, albumItem);
         break;
     }
 @ -447,4 +444,7  @ void ImageDescEdit::slotRightButtonClick
 void ImageDescEdit::tagNew(TAlbum* parAlbum, QCheckListItem *item)
 {
+    if(!parAlbum || !item)
+        return;
+        
     QString title, icon;
     AlbumManager *albumMan_ = AlbumManager::instance();
 @ -473,5 +473,5  @ void ImageDescEdit::tagNew(TAlbum* parAl
 }
 
-void ImageDescEdit::tagDelete(TAlbum *album)
+void ImageDescEdit::tagDelete(TAlbum *album, QCheckListItem *item)
 {
     if (!album || album->isRoot())
 @ -490,4 +490,7  @ void ImageDescEdit::tagDelete(TAlbum *al
             KMessageBox::error(0, errMsg);
     }
+
+    if(item)
+        delete item;    
 }
 

--- kdeextragear-3/digikam/digikam/imagedescedit.h  #1.8:1.9
 @ -49,5 +49,5  @ private:
     void tagNew(TAlbum* parAlbum, QCheckListItem *item);
     void tagEdit(TAlbum* album);
-    void tagDelete(TAlbum *album);
+    void tagDelete(TAlbum *album, QCheckListItem *item);
     
     QGuardedPtr<Digikam::ThumbnailJob> m_thumbJob;