Merge lp:~zorba-coders/zorba/bug1010746b into lp:zorba

Proposed by Rodolfo Ochoa on 2012-09-08
Status: Merged
Approved by: Rodolfo Ochoa on 2012-09-15
Approved revision: 10942
Merged at revision: 11046
Proposed branch: lp:~zorba-coders/zorba/bug1010746b
Merge into: lp:zorba
Diff against target: 14 lines (+2/-1)
1 file modified
src/context/dynamic_loader.cpp (+2/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug1010746b
Reviewer Review Type Date Requested Status
Juan Zacarias 2012-09-08 Approve on 2012-09-13
Chris Hillery 2012-09-10 Approve on 2012-09-11
Review via email: mp+123423@code.launchpad.net

Commit message

Fix to avoid message box on windows and the error can be handled by Zorba only.

Description of the change

Fix to avoid message box on windows and the error can be handled by Zorba only.

To post a comment you must log in.
Chris Hillery (ceejatec) wrote :

Change looks fine to me. Juan please confirm that it does what is intended (suppresses Windows dialog box when running an image module query without ImageMagick installed).

review: Approve
Juan Zacarias (juan457) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug1010746b-2012-09-15T02-39-50.037Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/context/dynamic_loader.cpp'
2--- src/context/dynamic_loader.cpp 2012-08-30 13:45:43 +0000
3+++ src/context/dynamic_loader.cpp 2012-09-10 13:59:23 +0000
4@@ -153,8 +153,9 @@
5 0, aFile.c_str(), -1,
6 wpath_str, sizeof(wpath_str)/sizeof(WCHAR));
7 }
8-
9+ SetErrorMode(SEM_NOOPENFILEERRORBOX|SEM_FAILCRITICALERRORS);
10 handle = LoadLibraryW(wpath_str);
11+ SetErrorMode(0);
12 if (!handle)
13 throw ZORBA_EXCEPTION(
14 zerr::ZOSE0005_DLL_LOAD_FAILED,

Subscribers

People subscribed via source and target branches