Reformat and refactor

shmuz · Jan 12, 2025 · 637c8a3 · 637c8a3
1 parent a2264a9
commit 637c8a3
Show file tree

Hide file tree

Showing 7 changed files with 217 additions and 350 deletions.
diff --git a/far/src/clipboard.cpp b/far/src/clipboard.cpp
@@ -248,19 +248,17 @@ wchar_t *Clipboard::Paste(bool &IsVertical, int MaxChars)
 	if (MaxChars >= 0 && CharsCount < (size_t)MaxChars)
 		CharsCount = (size_t)MaxChars;
 
+	IsVertical = false;
 	wchar_t *ClipText = (wchar_t *)malloc((CharsCount + 1) * sizeof(wchar_t));
-	if (ClipText)
-	{
+	if (ClipText) {
 		wmemcpy(ClipText, (const wchar_t *)ClipData, CharsCount);
 		ClipText[CharsCount] = 0;
-	}
 
-	IsVertical = false;
-
-	if (wcsstr(ClipText, NATIVE_EOLW)) {
-		UINT FormatType = RegisterFormat(FAR_VerticalBlock_Unicode);
-		if (FormatType && IsFormatAvailable(FormatType)) {
-			IsVertical = true;
+		if (wcsstr(ClipText, NATIVE_EOLW)) {
+			UINT FormatType = RegisterFormat(FAR_VerticalBlock_Unicode);
+			if (FormatType && IsFormatAvailable(FormatType)) {
+				IsVertical = true;
+			}
 		}
 	}
 

diff --git a/far/src/console/grabber.cpp b/far/src/console/grabber.cpp
@@ -73,6 +73,7 @@ Grabber::Grabber() :
 	DisplayObject();
 	Process();
 	delete SaveScr;
+	SaveScr = nullptr; //prevent repeated deletion in ScreenObject
 	pFrame->Unlock();
 	FrameManager->RefreshFrame();
 }

diff --git a/far/src/console/grabber.hpp b/far/src/console/grabber.hpp
@@ -46,7 +46,6 @@ class Grabber:Modal
 {
 	private:
 		ChangeMacroArea Cma;
-		SaveScreen *SaveScr;
 		GrabberArea PrevArea;
 		GrabberArea GArea;
 		int ResetArea;