From d13b2b658eaef9d3447ee9f3f46f92878e6fa370 Mon Sep 17 00:00:00 2001 From: Detlef Riekenberg Date: Tue, 15 Sep 2009 17:25:52 +0200 Subject: [PATCH] twain_32/tests: Avoid a Dialog from a DS when the scanner is not connected. --- dlls/twain_32/tests/dsm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 0cc82208e3..f3b6f9520f 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -787,7 +787,8 @@ static void test_sources(TW_IDENTITY *appid) (rc == TWRC_FAILURE && status.ConditionCode == TWCC_NODS), "Get default invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); - if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) + /* A DS might display a Popup during MSG_OPENDS, when the scanner is not connected */ + if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS && winetest_interactive) { rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_OPENDS, &source); get_condition_code(appid, NULL, &status);