diff options
| author |  Jan Kanis <jan.code@jankanis.nl> | 2013-02-05 23:16:18 +0100 |
|---|---|---|
| committer | Jan Kanis <jan.code@jankanis.nl> | 2013-02-05 23:16:18 +0100 |
| commit | 9a89da3b3322887b976423ef283343e18d09ab6a (patch) | |
| tree | e1e01e5b70d76657a101b691bf0cab0aea9eabff /wildcard.cpp | |
| parent | e8da9999f61c7133b7387b9311068f432cbc8c47 (diff) | |
| parent | 3f5c02bf926b238512f7275f3344944daf416229 (diff) | |
merge branch 'bug-537' and branch 'bug-read-ctrlC'. This should fix both #537 and #516
Diffstat (limited to 'wildcard.cpp')
| -rw-r--r-- | wildcard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wildcard.cpp b/wildcard.cpp index 43b37743..8f48848f 100644 --- a/wildcard.cpp +++ b/wildcard.cpp @@ -728,7 +728,7 @@ static int wildcard_expand_internal(const wchar_t *wc, // debug( 3, L"WILDCARD_EXPAND %ls in %ls", wc, base_dir ); - if (reader_interrupted()) + if (is_main_thread() ? reader_interrupted() : reader_thread_job_is_stale()) { return -1; } |