Browse Source

NxWM: Fix double deletion of class

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4727 7fd9a85b-ad96-42d3-883c-3090e2eb8679
sbg
patacongo 13 years ago
parent
commit
e16fc112d8
  1. 5
      NxWidgets/ChangeLog.txt
  2. 5
      NxWidgets/nxwm/src/ccalibration.cxx
  3. 6
      NxWidgets/nxwm/src/ctaskbar.cxx

5
NxWidgets/ChangeLog.txt

@ -62,4 +62,7 @@
some special mouse and keyboard input event handling. some special mouse and keyboard input event handling.
* NxWM::CTaskbar: Correct the calculation of the physical size of the * NxWM::CTaskbar: Correct the calculation of the physical size of the
display. display.
* NxWM::CCalibration: run method must clear m_stop when returning, or you can
never restart the Calibration window.
* NxWM::CTaskbar: On a failure to start an application, the application icon
CImage was being deleted twice.

5
NxWidgets/nxwm/src/ccalibration.cxx

@ -168,8 +168,9 @@ bool CCalibration::run(void)
touchscreenInput(sample); touchscreenInput(sample);
} }
return !m_stop; m_stop = false;
return true;
} }
/** /**

6
NxWidgets/nxwm/src/ctaskbar.cxx

@ -393,8 +393,12 @@ bool CTaskbar::startApplication(IApplication *app, bool minimized)
if (!app->run()) if (!app->run())
{ {
// Call stopApplication on a failure to start. This will call
// app->stop() (which is probably not necesary for the application
// but it should be prepared/ to handle it). stopApplication()
// will also removed the icon image from the list and delete it.
stopApplication(app); stopApplication(app);
image->disable();
return false; return false;
} }

Loading…
Cancel
Save