Fix of #8126: crash on startup with wx3.0:
this appeared after 1f362af
. The wxEXEC_SYNC is the default, but not using
wxEXEC_NOEVENTS caused a crash in wxWidgets3.0 (see #8126)
This commit is contained in:
parent
674f1683a1
commit
8004e19879
@ -555,10 +555,10 @@ void desktop_execute_get_result(wxString command, wxArrayString& output)
|
|||||||
if (wxGetEnv("APPIMAGE", nullptr)) {
|
if (wxGetEnv("APPIMAGE", nullptr)) {
|
||||||
// We're running from AppImage
|
// We're running from AppImage
|
||||||
wxExecuteEnv exec_env = get_appimage_exec_env();
|
wxExecuteEnv exec_env = get_appimage_exec_env();
|
||||||
::wxExecute(command, output, 0, &exec_env);
|
::wxExecute(command, output, wxEXEC_SYNC | wxEXEC_NOEVENTS, &exec_env);
|
||||||
} else {
|
} else {
|
||||||
// Looks like we're NOT running from AppImage, we'll make no changes to the environment.
|
// Looks like we're NOT running from AppImage, we'll make no changes to the environment.
|
||||||
::wxExecute(command, output);
|
::wxExecute(command, output, wxEXEC_SYNC | wxEXEC_NOEVENTS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif // __linux__
|
#endif // __linux__
|
||||||
|
Loading…
Reference in New Issue
Block a user