Merge pull request #12204 from t895/config-migration
android: Multi directory UI
This commit is contained in:
commit
aded28f276
32 changed files with 848 additions and 122 deletions
|
@ -924,12 +924,14 @@ std::string Config::AdjustOutputString(const std::string& string) {
|
|||
|
||||
// Windows requires that two forward slashes are used at the start of a path for unmapped
|
||||
// network drives so we have to watch for that here
|
||||
#ifndef ANDROID
|
||||
if (string.substr(0, 2) == "//") {
|
||||
boost::replace_all(adjusted_string, "//", "/");
|
||||
adjusted_string.insert(0, "/");
|
||||
} else {
|
||||
boost::replace_all(adjusted_string, "//", "/");
|
||||
}
|
||||
#endif
|
||||
|
||||
// Needed for backwards compatibility with QSettings deserialization
|
||||
for (const auto& special_character : special_characters) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue