bugfix

YukihoAA · Feb 19, 2019 · 787e756 · 787e756
1 parent b01a4af
commit 787e756
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/waifu2x_snowshell/Main.cpp b/waifu2x_snowshell/Main.cpp
@@ -27,7 +27,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR lpCmdL
 	// OpenCV 3.1 and later version does not supports x86 system.
 	IsWow64Process(GetCurrentProcess(), &is64bit);
 
-	hWnd = CreateWindow(lpszClass, L"waifu2x - Snowshell v1.8.3", WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_BORDER, CW_USEDEFAULT, CW_USEDEFAULT, 530, 370, NULL, NULL, hInstance, NULL);
+	hWnd = CreateWindow(lpszClass, L"waifu2x - Snowshell v1.8.4", WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_BORDER, CW_USEDEFAULT, CW_USEDEFAULT, 530, 370, NULL, NULL, hInstance, NULL);
 
 	ShowWindow(hWnd, nCmdShow);
 
@@ -369,7 +369,7 @@ BOOL Execute(HWND hWnd, ConvertOption *convertOption, LPCWSTR fileName, bool noL
 	// Set Converter
 	if (SnowSetting::CONVERTER_CAFFE.getAvailable() && SnowSetting::getCPU() != CPU_MID && SnowSetting::getCudaAvailable()) {
 		SnowSetting::CurrentConverter = &SnowSetting::CONVERTER_CAFFE;
-		if (!(SnowSetting::CONVERTER_CPP_x64.getAvailable() || SnowSetting::CONVERTER_CPP_x86.getAvailable()))
+		if (!SnowSetting::CONVERTER_CPP_x64.getAvailable())
 			convertOption->setForceCPU(true);
 	}
 	else if (SnowSetting::CONVERTER_CPP_x64.getAvailable()) {

diff --git a/waifu2x_snowshell/SnowSetting.cpp b/waifu2x_snowshell/SnowSetting.cpp
@@ -598,8 +598,8 @@ bool SnowSetting::loadSetting()
 	GetPrivateProfileStringW(Section.c_str(), L"waifu2x_converter_cpp_x86", L"", buf, MAX_PATH, INIPath.c_str());
 	CONVERTER_CPP_x86.setOptionString(buf);
 
-
 	IsCudaAvailable = checkCuda();
+
 	return true;
 }
 

diff --git a/waifu2x_snowshell/waifu2x_snowshell.rc b/waifu2x_snowshell/waifu2x_snowshell.rc