Author: ekohl
Date: Thu Dec 31 12:58:18 2015
New Revision: 70470
URL:
http://svn.reactos.org/svn/reactos?rev=70470&view=rev
Log:
[SOLITAIRE]
solitaire: no action upon doubleclick
Patch by Carlo Bramini.
CORE-6514 #resolve #comment Thanks a lot!
Modified:
trunk/reactos/base/applications/games/solitaire/solgame.cpp
trunk/reactos/base/applications/games/solitaire/solitaire.cpp
Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] Thu Dec 31
12:58:18 2015
@@ -12,6 +12,7 @@
CardStack activepile;
int LastId;
bool fGameStarted = false;
+bool bAutoroute = false;
void NewGame(void)
{
@@ -233,7 +234,7 @@
SetPlayTimer();
//only drop 1 card at a time
- if(dragcards.NumCards() != 1)
+ if (!bAutoroute && dragcards.NumCards() != 1)
{
TRACE("EXIT SuitStackDropProc()\n");
return false;
@@ -415,7 +416,9 @@
//stackobj.MoveCards(pDest, 1, true);
//use the SimulateDrag funcion, because we get the
//AddProc callbacks called for us on the destination stacks...
+ bAutoroute = true;
stackobj.SimulateDrag(pDest, 1, true);
+ bAutoroute = false;
}
TRACE("EXIT RowStackDblClickProc()\n");
}
Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Thu Dec 31
12:58:18 2015
@@ -243,6 +243,8 @@
NULL, // use window class menu
hInst, // program instance handle
NULL); // creation parameters
+ if (hwnd == NULL)
+ return 1;
hwndMain = hwnd;