filter plugin will not be used when init failed (plugin not found or none selected)

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@126 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
spacy51 2007-12-01 12:56:18 +00:00
parent b25efd3b1f
commit f3547062b5
1 changed files with 18 additions and 8 deletions

View File

@ -711,9 +711,14 @@ void VBA::updateFilter()
filterMagnification = 1; filterMagnification = 1;
break; break;
case FILTER_PLUGIN: case FILTER_PLUGIN:
if (rpiInit(pluginName)) if( rpiInit( pluginName ) ) {
filterFunction = rpiFilter; filterFunction = rpiFilter;
filterMagnification = rpiScaleFactor(); filterMagnification = rpiScaleFactor();
} else {
filterType = FILTER_NONE;
updateFilter();
return;
}
break; break;
case FILTER_TVMODE: case FILTER_TVMODE:
filterFunction = ScanlinesTV; filterFunction = ScanlinesTV;
@ -792,10 +797,15 @@ void VBA::updateFilter()
filterMagnification = 1; filterMagnification = 1;
break; break;
case FILTER_PLUGIN: case FILTER_PLUGIN:
if (rpiInit(pluginName)) if( rpiInit( pluginName ) ) {
filterFunction = rpiFilter; filterFunction = rpiFilter;
filterMagnification = rpiScaleFactor(); filterMagnification = rpiScaleFactor();
b16to32Video=true; b16to32Video=true;
} else {
filterType = FILTER_NONE;
updateFilter();
return;
}
break; break;
case FILTER_TVMODE: case FILTER_TVMODE:
filterFunction = ScanlinesTV32; filterFunction = ScanlinesTV32;