| Summary: | Crash when adding tag in comment/tag dialog | ||
|---|---|---|---|
| Product: | [Applications] digikam | Reporter: | Maarten Wisse <Maarten.Wisse> |
| Component: | Tags-Captions | Assignee: | Digikam Developers <digikam-bugs-null> |
| Status: | RESOLVED FIXED | ||
| Severity: | crash | CC: | caulier.gilles |
| Priority: | NOR | ||
| Version First Reported In: | 0.7.0 | ||
| Target Milestone: | --- | ||
| Platform: | Gentoo Packages | ||
| OS: | Linux | ||
| Latest Commit: | Version Fixed/Implemented In: | 7.6.0 | |
| Sentry Crash Report: | |||
|
Description
Maarten Wisse
2004-10-22 18:56:52 UTC
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;
|