← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdemultimedia/oneiric

« back to all changes in this revision

Viewing changes to kmix/kmix.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-07-08 04:46:07 UTC
  • mfrom: (1.2.46 upstream)
  • Revision ID: james.westby@ubuntu.com-20100708044607-0hnttkd3mbdaogr3
Tags: 4:4.4.92-0ubuntu1
* New upstream rc release
  - Bump kde-sc-dev-latest to 4.4.92
  - Confirmed symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
kmix/kmix.cpp
75
75
   m_multiDriverMode (false), // -<- I never-ever want the multi-drivermode to be activated by accident
76
76
   m_dockWidget(),
77
77
   m_dontSetDefaultCardOnStart (false),
78
 
   _dockAreaPopup(0)
 
78
   _dockAreaPopup(0),
 
79
   _volWA(0)
79
80
{
80
81
    setObjectName("KMixWindow");
81
82
    // disable delete-on-close because KMix might just sit in the background waiting for cards to be plugged in
206
207
      m_dockWidget->deleteLater();
207
208
      m_dockWidget = 0L;
208
209
   }
209
 
   if ( _dockAreaPopup ) {
 
210
   if ( _volWA ) {
210
211
      // If this is called during a master control change, we rather play safe by using deleteLater().
211
 
      _dockAreaPopup->deleteLater();
 
212
      // Note: deleting _volWA also deletes its associated _dockAreaPopup and prevents the action to be left
 
213
      // with a dangling pointer.
 
214
      _volWA->deleteLater();
 
215
      _volWA = 0L;
212
216
      _dockAreaPopup = 0L;
213
217
   }
214
218
 
224
228
      _dockAreaPopup = new ViewDockAreaPopup(volMenu, "dockArea", Mixer::getGlobalMasterMixer(), 0, (GUIProfile*)0, this);
225
229
      _dockAreaPopup->createDeviceWidgets();
226
230
 
227
 
      QWidgetAction *volWA = new QWidgetAction(volMenu);
228
 
      volWA->setDefaultWidget(_dockAreaPopup);
229
 
      volMenu->addAction(volWA);
 
231
      _volWA = new QWidgetAction(volMenu);
 
232
      _volWA->setDefaultWidget(_dockAreaPopup);
 
233
      volMenu->addAction(_volWA);
230
234
      referenceWidgetForSystray = volMenu;
231
235
   }
232
236
   m_dockWidget = new KMixDockWidget( this, referenceWidgetForSystray, _dockAreaPopup );