From e35ae9d5a1b615af919fe1ce677fb276c8f91100 Mon Sep 17 00:00:00 2001
From: Hendrik Langer <hendrik+dev@xd0.de>
Date: Tue, 24 Jul 2018 13:32:32 +0200
Subject: [PATCH] repair screenshot tool

---
 windows-snapshot-tool/bin/freeze.exe | Bin 401237 -> 401237 bytes
 windows-snapshot-tool/src/main.cpp   |  27 ++++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/windows-snapshot-tool/bin/freeze.exe b/windows-snapshot-tool/bin/freeze.exe
index 2a027185edbf98ac7f585aa5b3afc08fc5d4df2f..49bd256d25d59ded757d6f572ce3c936d15b48c7 100755
GIT binary patch
delta 796
zcmcb*PvYu6i3uG{PJ9!){Fs(BZoGAnLw<pS14E~a3d?a86$T(!*i!7k@c%;d8;(xb
zFU_@ICYy7~GJcsH%B5(e7vR9Ka0gVHWwAnn14FkfP}z=!U^86L9CuywT*86jxa$fI
zph?GFmrP#4rNg*q@)|A;#tW1GaY=h0IPQ7^WXo~a4G?Mzm|{`+|NlS3LWd%V)hwN^
zM|xeCbh4-{+yJvKt@Qx^lmjgXO1O4_w7mQ|Ifc8peqjq(OXs0p*99O?bc(1fOhI_y
zLv!s1h7yl%*9FZ#80#FmT|YD*VCjZ=*AD2P7dCPX3^1eRUmRj#0Q%_z$mTsT$3X0p
zX2g_vG5H4fe(x(F)l;CB3INTT3Ua1lx9bgCA!Y`KQq~unfK;z5SltDff1vyZ82|OW
zZr3}TAMvbUW^|q0El|LCX7V2aS;lpfr39@RH%$%`tYG{(`Mls8Mw!Wbgp?RxZoV(H
zj)n2j<UVm}#=Oa^#I+gACSL=R*CsPbn2Wy?1iALhYq4h6FO08eK)m$g#^eAAT}Hdf
zbrLd+YbVbJk~=2vkjPdy0S0LE8v&pLKwfcydA!^80g(TK4=l@a^6+MF$;Tp+A&JG=
zNr^?yMX8A;sVNK$#SEDYc?{_cIg{t>i8sgTwa4i(0x=U1GXpWp_BcJ(qM-Wcz$C%Q
zpuoTciamx$KuU`TS>yvy#1}>6FHocaMMMA?juyPgx-@|z*HA<pfFkdKPDa=j3lvEe
Z5=IuP0SZM=Pi$nBX8gUqwvqM5TmY5%4LSe-

delta 714
zcmcb*PvYu6i3uG{kJ%@7`7zy1*m&z8M`%lt1H=Cdorii|-*mdDuyl&3EKDf|2{pgr
z=yd(kT>FKg#J$_~P3wU=hi)MM082LmNa1l76}<olh8KV385mj*@J~6=a-c;1MH3qX
z15nlEjoiW_x0%4~P8OAgd%%`7zhRj?i&KW>Lv!ti$-6jZ89z+E!Kr9u12ksg4yc_h
zixm<afJOlA-m-9kg9AgS>xtv8E1pR>FdTPX!ok1*q!vup=F(x@F<GBWgYnGdMlNZg
zJ;z;-0HuI(YarBy$?LepSq}69)t=;%Wvrh3oU3^94ekTp7eLOL0<}y4=<ul^hZ}ag
zUa=KoW?(2~eX$8h^}2%9U4S_X%5Q-2U(f4yy|MW*&kANnx5+&M1&n7W{}qsBTt8V_
z(3)}c<Z!_X#$S^!2)<#IoxE2_iSgCu2SV#u7#~mW7nf$tpS)UJo3VWIbs%|tGP8ua
z_<KQcK)n`gcKyQmdPcYF2cRQg+?*UJq04ALxn4qsaoyxOKyv5gof6p^ra&JyzY*wm
zy#w-!3oK;2T_1pS@q=YqP9C1H*<13lh)gj<CPN-WIztXaDo`dQu{b*^vB<e7HL)Z$
zrP)ib-Aj)Vh?#(x8Hic7d+D*Z1=T+T1~ems0s}Axf#4C4(&RxF`2ZC0K@s^26v;;s
z5demxIWMv<O`ynC6cGoY$U8n{HL*aE6d_?`p&Fo2)bzwgR%ymx+iM$HZ_EV%f#2&W

diff --git a/windows-snapshot-tool/src/main.cpp b/windows-snapshot-tool/src/main.cpp
index bb5214d..7645e83 100644
--- a/windows-snapshot-tool/src/main.cpp
+++ b/windows-snapshot-tool/src/main.cpp
@@ -30,19 +30,6 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
                     LPSTR lpszArgument,
                     int nCmdShow)
 {
-    // Do screenshot from cmdline
-    LPWSTR *szArgList;
-    int argCount;
-    szArgList = CommandLineToArgvW(GetCommandLine(), &argCount);
-    if (szArgList != NULL && argCount >= 1) {
-        if (wcscmp(L"single", szArgList[1])==0) {
-            doScreenshot();
-            LocalFree(szArgList);
-            return 0;
-        }
-    }
-    LocalFree(szArgList);
-
     // kill other already running instances
     HWND existingApp = FindWindow(0, szClassName);
     if (existingApp)
@@ -89,6 +76,20 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
                hThisInstance,       /* Program Instance handler */
                NULL                 /* No Window Creation data */
            );
+
+    // Do screenshot from cmdline
+    LPWSTR *szArgList;
+    int argCount;
+    szArgList = CommandLineToArgvW(GetCommandLine(), &argCount);
+    if (szArgList != NULL && argCount >= 2) {
+        if (wcscmp(L"single", szArgList[1])==0) {
+            doScreenshot();
+            LocalFree(szArgList);
+            return 0;
+        }
+    }
+    LocalFree(szArgList);
+
     /*Initialize the NOTIFYICONDATA structure only once*/
     InitNotifyIconData();