ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Let the user know when WinPcap isn't loaded.

This commit is contained in:
Jules.A 2018-11-02 07:35:15 +08:00
parent 4705c3e59a
commit 36040e90a3
1 changed files with 20 additions and 20 deletions
desmume/src/frontend/windows
main.cpp

28
desmume/src/frontend/windows/main.cpp
View File

@ -6238,6 +6238,8 @@ LRESULT CALLBACK WifiSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
int menuItemCount = ComboBox_GetCount(deviceMenu); int menuItemCount = ComboBox_GetCount(deviceMenu);
int deviceCount = -1; int deviceCount = -1;
std::vector<std::string> deviceStringList; std::vector<std::string> deviceStringList;
int curSel = 0;
bool enableWin = false;
for (int i = 0; i < menuItemCount; i++) for (int i = 0; i < menuItemCount; i++)
{ {
@ -6247,19 +6249,10 @@ LRESULT CALLBACK WifiSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
if (isPCapSupported) if (isPCapSupported)
{ {
deviceCount = wifiHandler->GetBridgeDeviceList(&deviceStringList); deviceCount = wifiHandler->GetBridgeDeviceList(&deviceStringList);
}
if (deviceCount < 0) if (deviceCount <= 0)
{ {
ComboBox_AddString(deviceMenu, "Error: Cannot find any devices."); ComboBox_AddString(deviceMenu, "Error: No devices found.");
ComboBox_SetCurSel(deviceMenu, 0);
EnableWindow(deviceMenu, FALSE);
}
else if (deviceCount == 0)
{
ComboBox_AddString(deviceMenu, "No devices found.");
ComboBox_SetCurSel(deviceMenu, 0);
EnableWindow(deviceMenu, FALSE);
} }
else else
{ {
@ -6267,11 +6260,18 @@ LRESULT CALLBACK WifiSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
{ {
ComboBox_AddString(deviceMenu, deviceStringList[i].c_str()); ComboBox_AddString(deviceMenu, deviceStringList[i].c_str());
} }
curSel = CommonSettings.wifi.infraBridgeAdapter;
ComboBox_SetCurSel(deviceMenu, CommonSettings.wifi.infraBridgeAdapter); enableWin = true;
EnableWindow(deviceMenu, TRUE);
} }
} }
else
{
ComboBox_AddString(deviceMenu, "Error: Could not load WinPcap.");
}
ComboBox_SetCurSel(deviceMenu, curSel);
EnableWindow(deviceMenu, enableWin);
}
return TRUE; return TRUE;
case WM_COMMAND: case WM_COMMAND: