Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved exception handling to catch errors in setting-files #43

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Moved exception handling to catch errors in setting-files #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/winmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,21 +606,21 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR lpszCmdLine, int)
customParam = getParamVal('p', lpszCmdLine);
}

// Object (gupParams) is moved here because we need app icon form configuration file
GupParameters gupParams("gup.xml");
appIconFile = gupParams.getSoftwareIcon();
try {
// Object (gupParams) is moved here because we need app icon form configuration file
GupParameters gupParams("gup.xml");
appIconFile = gupParams.getSoftwareIcon();

if (isHelp)
{
::MessageBoxA(NULL, MSGID_HELP, "GUP Command Argument Help", MB_OK);
return 0;
}
if (isHelp)
{
::MessageBoxA(NULL, MSGID_HELP, "GUP Command Argument Help", MB_OK);
return 0;
}

GupExtraOptions extraOptions("gupOptions.xml");
GupNativeLang nativeLang("nativeLang.xml");
GupExtraOptions extraOptions("gupOptions.xml");
GupNativeLang nativeLang("nativeLang.xml");

hInst = hInstance;
try {
hInst = hInstance;
if (launchSettingsDlg)
{
if (extraOptions.hasProxySettings())
Expand Down