[Winmerge-svn] SF.net SVN: winmerge: [3947] trunk/Src

[<ki...@us...>]

Revision: 3947
          http://svn.sourceforge.net/winmerge/?rev=3947&view=rev
Author:   kimmov
Date:     2006-12-11 14:27:30 -0800 (Mon, 11 Dec 2006)

Log Message:
-----------
PATCH: [ 1610998 ] Splash screen does not stop timer

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/Splash.cpp

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-12-11 22:18:50 UTC (rev 3946)
+++ trunk/Src/Changes.txt	2006-12-11 22:27:30 UTC (rev 3947)
@@ -5,6 +5,8 @@
 2006-12-11 Kimmo
  Fix error in logical condition for checking if item is directory
   Src: FileInfo.cpp
+ PATCH: [ 1610998 ] Splash screen does not stop timer
+  Src: Splash.cpp
 
 2006-12-10 Gal
  BUG: [ 1611542 ] "Wrap lines" does not work for diff pane

Modified: trunk/Src/Splash.cpp
===================================================================
--- trunk/Src/Splash.cpp	2006-12-11 22:18:50 UTC (rev 3946)
+++ trunk/Src/Splash.cpp	2006-12-11 22:27:30 UTC (rev 3947)
@@ -53,6 +53,9 @@
 /** @brief Area for copyright text. */
 static const CRect CopyrightArea(20, 210, 190, 330);
 
+/** @brief ID for the timer closing splash screen. */
+static const UINT_PTR SplashTimerID = 1;
+
 /////////////////////////////////////////////////////////////////////////////
 //   Splash Screen class
 
@@ -161,6 +164,7 @@
  */
 void CSplashWnd::HideSplashScreen()
 {
+	KillTimer(SplashTimerID);
 	m_pPicture->Free();
 	delete m_pPicture;
 	m_pPicture = NULL;
@@ -188,7 +192,7 @@
 	CenterWindow();
 
 	// Set a timer to destroy the splash screen.
-	SetTimer(1, 5000, NULL);
+	SetTimer(SplashTimerID, 5000, NULL);
 
 	return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.