summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-06-30 17:01:36 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2018-06-30 17:01:36 (GMT)
commitd7f55fefe36a1f30618ab7dd5e6e39cdba98e541 (patch)
tree9c02068510daba16505e833b078d500c041f66a7
parenta94535c16eb309fdd23648511e0f552fccaf7173 (diff)
downloadtdebase-d7f55fef.zip
tdebase-d7f55fef.tar.gz
Fix reset of auto-action in medianotifier
This resolves bug 2941 Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--tdeioslave/media/libmediacommon/notifiersettings.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp
index 40a09ba..a957c75 100644
--- a/tdeioslave/media/libmediacommon/notifiersettings.cpp
+++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp
@@ -161,8 +161,10 @@ void NotifierSettings::resetAutoAction( const TQString &mimetype )
if ( m_autoMimetypesMap.contains( mimetype ) )
{
NotifierAction *action = m_autoMimetypesMap[mimetype];
- action->removeAutoMimetype( mimetype );
- m_autoMimetypesMap.remove(mimetype);
+ if ( action ) {
+ action->removeAutoMimetype( mimetype );
+ }
+ m_autoMimetypesMap[mimetype] = 0L;
}
}