diff options
| author | Pär Björklund <per.bjorklund@gmail.com> | 2015-11-18 20:12:35 +0100 |
|---|---|---|
| committer | Pär Björklund <per.bjorklund@gmail.com> | 2015-11-18 20:12:35 +0100 |
| commit | 46130fc90d801ce3669983c6206f4ad5292096b8 (patch) | |
| tree | 379f79868b607464b9a6624aa26054a2850f71f0 | |
| parent | 509798180adfef1507ea9979a42479329a779e3d (diff) | |
| parent | de6207b36f84708e6320a8a80db83d19bd884ae2 (diff) | |
Merge pull request #8356 from MilhouseVH/fix_export_dialog
Fix inversion of export library dialogs, fix #16317, fix #16358
| -rw-r--r-- | xbmc/dialogs/GUIDialogYesNo.cpp | 1 | ||||
| -rw-r--r-- | xbmc/interfaces/builtins/LibraryBuiltins.cpp | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/xbmc/dialogs/GUIDialogYesNo.cpp b/xbmc/dialogs/GUIDialogYesNo.cpp index 04d5194c7f..779909c710 100644 --- a/xbmc/dialogs/GUIDialogYesNo.cpp +++ b/xbmc/dialogs/GUIDialogYesNo.cpp @@ -146,6 +146,7 @@ int CGUIDialogYesNo::ShowAndGetInput(const KODI::MESSAGING::HELPERS::DialogYesNo SetChoice(1, options.yesLabel); if (options.autoclose > 0) SetAutoClose(options.autoclose); + m_bCanceled = false; for (size_t i = 0; i < 3; ++i) { diff --git a/xbmc/interfaces/builtins/LibraryBuiltins.cpp b/xbmc/interfaces/builtins/LibraryBuiltins.cpp index 444628727e..9f2e379725 100644 --- a/xbmc/interfaces/builtins/LibraryBuiltins.cpp +++ b/xbmc/interfaces/builtins/LibraryBuiltins.cpp @@ -89,7 +89,7 @@ static int ExportLibrary(const std::vector<std::string>& params) bool cancelled=false; if (params.size() > 1) - singleFile = StringUtils::EqualsNoCase(params[1], "true"); + singleFile = StringUtils::EqualsNoCase(params[1], "false"); else { HELPERS::DialogResponse result = HELPERS::ShowYesNoDialogText(CVariant{iHeading}, CVariant{20426}, CVariant{20428}, CVariant{20429}); @@ -100,7 +100,7 @@ static int ExportLibrary(const std::vector<std::string>& params) if (cancelled) return -1; - if (singleFile) + if (!singleFile) { if (params.size() > 2) thumbs = StringUtils::EqualsNoCase(params[2], "true"); @@ -130,7 +130,7 @@ static int ExportLibrary(const std::vector<std::string>& params) if (cancelled) return -1; - if (singleFile) + if (!singleFile) { if (params.size() > 3) overwrite = StringUtils::EqualsNoCase(params[3], "true"); @@ -147,7 +147,7 @@ static int ExportLibrary(const std::vector<std::string>& params) if (params.size() > 2) path=params[2]; - if ((singleFile && !path.empty()) || + if (!singleFile || !path.empty() || CGUIDialogFileBrowser::ShowAndGetDirectory(shares, g_localizeStrings.Get(661), path, true)) { |