Changeset 10269 for trunk/src/winmm/time.cpp

Timestamp:

Oct 13, 2003, 11:18:38 AM (22 years ago)

Author:

sandervl

Message:

Make sure the timer object is not deleted inside the timer callback handler

File:

• trunk/src/winmm/time.cpp (modified) (4 diffs)

trunk/src/winmm/time.cpp

@@ -1 @@
-/* $Id: time.cpp,v 1.17 2003-03-05 14:48:45 sandervl Exp $ */
+/* $Id: time.cpp,v 1.18 2003-10-13 09:18:38 sandervl Exp $ */
 
 /*
@@ -145 +145 @@
   }
   HMHandleFree(IDEvent);
-  // return OS2Timer::killEvent(UINT IDEvent)
-
-  delete os2timer;
+
+  os2timer->KillTimer();
+  os2timer->release();
   return TIMERR_NOERROR;
 }
@@ -205 +205 @@
   if(HMHandleAllocate(&timerID, (ULONG)timer) != NO_ERROR) {
       dprintf(("HMHandleAllocate failed!!"));
-      delete timer;
+      timer->release();
       return 0;
   }
@@ -213 +213 @@
   {
     dprintf(("WINMM:timeSetEvent: couldn't start timer!\n"));
-    delete(timer);
+    timer->release();
     return(0);
   }