expand_string should not return any results on error

Fixes #2796
This commit is contained in:
ridiculousfish 2016-03-05 21:50:05 -08:00
parent a37d4d809e
commit 6bee85fefa

View File

@ -1908,13 +1908,15 @@ expand_error_t expand_string(const wcstring &input, std::vector<completion_t> *o
output_storage.clear();
}
/* Hack to un-expand tildes (see #647) */
if (!(flags & EXPAND_SKIP_HOME_DIRECTORIES))
if (total_result != EXPAND_ERROR)
{
unexpand_tildes(input, &completions);
/* Hack to un-expand tildes (see #647) */
if (!(flags & EXPAND_SKIP_HOME_DIRECTORIES))
{
unexpand_tildes(input, &completions);
}
out_completions->insert(out_completions->end(), completions.begin(), completions.end());
}
out_completions->insert(out_completions->end(), completions.begin(), completions.end());
return total_result;
}