sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NxWM: Fix double deletion of class

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4727 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-05-12 21:12:56 +00:00
parent eb31d305a1
commit 4b352d5052
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@ -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
nxwm/src/ccalibration.cxx
View File

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

6
nxwm/src/ctaskbar.cxx
View File

@ -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;
} }