From 912fb918d7c7203a98c31e87ce3d0e7f2468b9ec Mon Sep 17 00:00:00 2001
From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com>
Date: Wed, 15 Feb 2023 16:06:37 +0100
Subject: [PATCH] 1.8.0

---
 Sandboxie/common/my_version.h                    |  4 ++--
 Sandboxie/msgs/Sbie-English-1033.txt             | 12 ++++++++++++
 SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp |  4 +---
 SandboxiePlus/SandMan/Windows/OptionsWindow.cpp  |  3 +++
 SandboxiePlus/version.h                          |  4 ++--
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Sandboxie/common/my_version.h b/Sandboxie/common/my_version.h
index f1bfe0e7..99009e77 100644
--- a/Sandboxie/common/my_version.h
+++ b/Sandboxie/common/my_version.h
@@ -21,8 +21,8 @@
 #ifndef _MY_VERSION_H
 #define _MY_VERSION_H
 
-#define MY_VERSION_BINARY       5,62,3
-#define MY_VERSION_STRING       "5.62.3"
+#define MY_VERSION_BINARY       5,63,0
+#define MY_VERSION_STRING       "5.63.0"
 #define MY_ABI_VERSION          0x56000
 
 // These #defines are used by either Resource Compiler or NSIS installer
diff --git a/Sandboxie/msgs/Sbie-English-1033.txt b/Sandboxie/msgs/Sbie-English-1033.txt
index 81a8a778..ac623614 100644
--- a/Sandboxie/msgs/Sbie-English-1033.txt
+++ b/Sandboxie/msgs/Sbie-English-1033.txt
@@ -366,6 +366,18 @@ SBIE2111 Process is not accessible: %3, call %2
 SBIE2112 Object is not accessible: %3, call %2
 .
 
+2113;pop;inf;01
+SBIE2113 File is too large to copy into sandbox, creating empty file - %2
+.
+
+2114;pop;inf;01
+SBIE2114 File is too large to copy into sandbox, denying access - %2
+.
+
+2115;pop;inf;01
+SBIE2115 File is too large to copy into sandbox, opening read only - %2
+.
+
 # %2 = Mozilla Firefox
 2191;pop;inf;01
 SBIE2191 %2 should not be updated while running under Sandboxie.
diff --git a/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp b/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
index 5e8e6c51..2bb44be1 100644
--- a/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
+++ b/SandboxiePlus/SandMan/Windows/OptionsGeneral.cpp
@@ -391,8 +391,6 @@ void COptionsWindow::SaveGeneral()
 	WriteAdvancedCheck(ui.chkDenyWrite, "CopyBlockDenyWrite", "y", "");
 	WriteAdvancedCheck(ui.chkNoCopyMsg, "NotifyNoCopy", "y", "");
 
-	if (m_CopyRulesChanged)
-		SaveCopyRules();
 
 	WriteAdvancedCheck(ui.chkProtectBox, "NeverDelete", "y", "");
 	WriteAdvancedCheck(ui.chkAutoEmpty, "AutoDelete", "y", "");
@@ -674,7 +672,7 @@ void COptionsWindow::OnAddCopyRule()
 void COptionsWindow::OnDelCopyRule()
 {
 	QTreeWidgetItem* pItem = ui.treeCopy->currentItem();
-	if (!pItem)
+	if (!pItem || pItem->data(0, Qt::UserRole).toInt() == -1)
 		return;
 
 	delete pItem;
diff --git a/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp b/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp
index c8b2c380..49597289 100644
--- a/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp
+++ b/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp
@@ -847,6 +847,8 @@ void COptionsWindow::SaveConfig()
 	{
 		if (m_GeneralChanged)
 			SaveGeneral();
+		if (m_CopyRulesChanged)
+			SaveCopyRules();
 
 		if (m_GroupsChanged)
 			SaveGroups();
@@ -931,6 +933,7 @@ void COptionsWindow::ok()
 void COptionsWindow::reject()
 {
 	if (m_GeneralChanged
+	 || m_CopyRulesChanged
 	 || m_GroupsChanged
 	 || m_ForcedChanged
 	 || m_StopChanged
diff --git a/SandboxiePlus/version.h b/SandboxiePlus/version.h
index 8e213eb7..f66f584e 100644
--- a/SandboxiePlus/version.h
+++ b/SandboxiePlus/version.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #define VERSION_MJR		1
-#define VERSION_MIN 	7
-#define VERSION_REV 	3
+#define VERSION_MIN 	8
+#define VERSION_REV 	0
 #define VERSION_UPD 	0
 
 #ifndef STR