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

List:       kde-commits
Subject:    branches/marble/marble-1.1/src/lib
From:       Dennis Nienhüser <earthwings () gentoo ! org>
Date:       2011-03-31 21:02:19
Message-ID: 20110331210219.74175AC8CD () svn ! kde ! org
[Download RAW message or body]

SVN commit 1226665 by nienhueser:

Don't add actions multiple times.
Backport of commit 1226664.


 M  +1 -1      AbstractFloatItem.cpp  


--- branches/marble/marble-1.1/src/lib/AbstractFloatItem.cpp #1226664:1226665
@@ -199,7 +199,6 @@
     if ( !d->m_contextMenu )
     {
         d->m_contextMenu = new QMenu;
-    }
 
     QAction *lockAction = d->m_contextMenu->addAction( tr( "&Lock" ) );
     lockAction->setCheckable( true );
@@ -214,6 +213,7 @@
         QAction *configAction = d->m_contextMenu->addAction( tr( "&Configure..." ) );
         connect( configAction, SIGNAL( triggered() ), dialog, SLOT( exec() ) );
     }
+    }
 
     Q_ASSERT( d->m_contextMenu );
     return d->m_contextMenu;
[prev in list] [next in list] [prev in thread] [next in thread]