From 0bd330eedee899893ef921284a265d635d027f6b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 30 Nov 2023 13:28:18 +0300
Subject: =?UTF-8?q?fixes=20#3991=20(NewStory:=20=D0=B4=D0=BE=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=81=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8E=20=D0=B6=D1=83=D1=80=D0=BD=D0=B0=D0=BB=D0=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/NewStory/src/history_control.cpp | 22 ++++++----------------
 plugins/NewStory/src/history_menus.cpp   |  4 ++--
 2 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'plugins/NewStory')

diff --git a/plugins/NewStory/src/history_control.cpp b/plugins/NewStory/src/history_control.cpp
index d7f1217477..0f7fd29da9 100644
--- a/plugins/NewStory/src/history_control.cpp
+++ b/plugins/NewStory/src/history_control.cpp
@@ -436,22 +436,12 @@ CMStringW NewstoryListData::GatherSelected(bool bTextOnly)
 		if (!p->m_bSelected)
 			continue;
 
-		if (p->m_bOfflineFile) {
-			DB::EventInfo dbei(p->hEvent);
-			DB::FILE_BLOB blob(dbei);
-			if (p->m_bOfflineDownloaded)
-				ret.Append(blob.getLocalName());
-			else
-				ret.Append(_A2T(blob.getUrl()));
-		}
-		else {
-			if (bTextOnly)
-				ret.Append(p->wtext);
-			else { // copy text only
-				CMStringW wszText(p->formatString());
-				RemoveBbcodes(wszText);
-				ret.Append(wszText);
-			}
+		if (bTextOnly)
+			ret.Append(p->wtext);
+		else { // copy text only
+			CMStringW wszText(p->formatString());
+			RemoveBbcodes(wszText);
+			ret.Append(wszText);
 		}
 		ret.Append(L"\r\n");
 	}
diff --git a/plugins/NewStory/src/history_menus.cpp b/plugins/NewStory/src/history_menus.cpp
index 2404fa0a6b..607525a4db 100644
--- a/plugins/NewStory/src/history_menus.cpp
+++ b/plugins/NewStory/src/history_menus.cpp
@@ -52,8 +52,8 @@ HMENU NSMenu_Build(NewstoryListData *data, ItemData *item)
 		if (item->m_bOfflineFile) {
 			Menu_ModifyItem(hmiCopyUrl, (item->m_bOfflineDownloaded) ? TranslateT("Copy file path") : TranslateT("Copy URL"));
 			Menu_ShowItem(hmiCopyUrl, true);
-			Menu_ShowItem(hmiSaveAs, true);
-			Menu_ShowItem(hmiDownload, !item->m_bOfflineDownloaded);
+			Menu_ShowItem(hmiSaveAs, bNotProtected);
+			Menu_ShowItem(hmiDownload, !item->m_bOfflineDownloaded && bNotProtected);
 			Menu_ShowItem(hmiOpenFolder, item->m_bOfflineDownloaded);
 		}
 
-- 
cgit v1.2.3