Merge with develop

This commit is contained in:
kervala 2016-01-23 20:33:28 +01:00
parent b9a761925b
commit 059f3b77b4

View file

@ -107,6 +107,9 @@ void quitCrashReport ()
contReset(CrashCounterSock);
}
// make it global if other classes/functions want to access to it
NLMISC::CCmdArgs Args;
//---------------------------------------------------
// MAIN :
// Entry for the Application.
@ -143,9 +146,6 @@ INT_PTR CALLBACK MyDialogProc(
HWND SlashScreen = NULL;
HINSTANCE HInstance;
// make it global if other classes/functions want to access to it
NLMISC::CCmdArgs Args;
int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, LPSTR cmdline, int /* nCmdShow */)
#else
int main(int argc, char **argv)