wiasane: Skip SCAN_FIRST if ADF is already loaded

mback2k · Jun 23, 2014 · c4e6b09 · c4e6b09
1 parent a437025
commit c4e6b09
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/wiasane/wiasane.cpp b/wiasane/wiasane.cpp
@@ -321,6 +321,11 @@ WIAMICRO_API HRESULT MicroEntry(LONG lCommand, _Inout_ PVAL pValue)
 		case CMD_LOAD_ADF: // online
 			Trace(TEXT("CMD_LOAD_ADF"));
 
+			if (pContext->pTask && pContext->pTask->bUsingADF) {
+				hr = S_OK;
+				break;
+			}
+
 			hr = OpenScannerDevice(pValue->pScanInfo, pContext);
 			if (SUCCEEDED(hr)) {
 				oOption = pContext->oDevice->GetOption(WIASANE_OPTION_SOURCE);
@@ -355,7 +360,6 @@ WIAMICRO_API HRESULT MicroEntry(LONG lCommand, _Inout_ PVAL pValue)
 
 				CloseScannerDevice(pValue->pScanInfo, pContext);
 			}
-
 			break;
 
 		case CMD_UNLOAD_ADF: // online