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

Modify max_threads sanity check to better handle erroneous values

This commit is contained in:
Eleuin 2018-02-28 16:54:28 -05:00 committed by Rafael Kitover
parent c7c6ad6a87
commit 480541a205
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wx/opts.cpp
View File

@ -155,7 +155,7 @@ opt_desc opts[] = {
STROPT("Display/FilterPlugin", "", wxTRANSLATE("Filter plugin library"), gopts.filter_plugin), STROPT("Display/FilterPlugin", "", wxTRANSLATE("Filter plugin library"), gopts.filter_plugin),
ENUMOPT("Display/IFB", "", wxTRANSLATE("Interframe blending function"), gopts.ifb, wxTRANSLATE("none|smart|motionblur")), ENUMOPT("Display/IFB", "", wxTRANSLATE("Interframe blending function"), gopts.ifb, wxTRANSLATE("none|smart|motionblur")),
BOOLOPT("Display/KeepOnTop", "KeepOnTop", wxTRANSLATE("Keep window on top"), gopts.keep_on_top), BOOLOPT("Display/KeepOnTop", "KeepOnTop", wxTRANSLATE("Keep window on top"), gopts.keep_on_top),
INTOPT("Display/MaxThreads", "Multithread", wxTRANSLATE("Maximum number of threads to run filters in"), gopts.max_threads, 1, 8), INTOPT("Display/MaxThreads", "Multithread", wxTRANSLATE("Maximum number of threads to run filters in"), gopts.max_threads, 1, 256),
#ifdef __WXMSW__ #ifdef __WXMSW__
ENUMOPT("Display/RenderMethod", "", wxTRANSLATE("Render method; if unsupported, simple method will be used"), gopts.render_method, wxTRANSLATE("simple|opengl|direct3d")), ENUMOPT("Display/RenderMethod", "", wxTRANSLATE("Render method; if unsupported, simple method will be used"), gopts.render_method, wxTRANSLATE("simple|opengl|direct3d")),
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
@ -291,11 +291,12 @@ opts_t::opts_t()
retain_aspect = true; retain_aspect = true;
max_threads = wxThread::GetCPUCount(); max_threads = wxThread::GetCPUCount();
if (max_threads > 8) // handle erroneous thread count values appropriately
max_threads = 8; if (max_threads > 256)
max_threads = 256;
if (max_threads < 0) if (max_threads < 1)
max_threads = 2; max_threads = 1;
// 10 fixes stuttering on mac with openal, as opposed to 5 // 10 fixes stuttering on mac with openal, as opposed to 5
// also should be better for modern hardware in general // also should be better for modern hardware in general