Index: macro.cpp
===================================================================
--- macro.cpp	(revision 7996)
+++ macro.cpp	(working copy)
@@ -5069,7 +5069,7 @@
 
 begin:
 
-	if (Work.ExecLIBPos>=MR->BufferSize || !MR->Buffer)
+	if (!MR || (Work.ExecLIBPos>=MR->BufferSize || !MR->Buffer))
 	{
 done:
 
@@ -5096,7 +5096,8 @@
 		{
 			if (LockScr) delete LockScr;
 			LockScr=nullptr;
-			MR->Flags&=~MFLAGS_DISABLEOUTPUT; // ????
+			if (MR)
+				MR->Flags&=~MFLAGS_DISABLEOUTPUT; // ????
 		}
 
 		Clipboard::SetUseInternalClipboardState(false); //??
@@ -6036,6 +6037,9 @@
 					if (CtrlObject->Plugins->CallPlugin(guid,OPEN_FROMMACRO,&info,&ResultCallPlugin))
 						Ret=(__int64)ResultCallPlugin;
 
+					if (MR != Work.MacroWORK) // ???
+						MR=Work.MacroWORK;
+
 					if( CallPluginRules == 1 )
 						PopState();
 					else
@@ -6121,6 +6125,8 @@
 					// ���� ���� ������ - �� ����� ���������
 					Data.CallFlags&=~CPT_CHECKONLY;
 					CtrlObject->Plugins->CallPluginItem(guid,&Data);
+					if (MR != Work.MacroWORK)
+						MR=Work.MacroWORK;
 				}
 			}
 			else

Index: macro.cpp
===================================================================
--- macro.cpp	(revision 7991)
+++ macro.cpp	(working copy)
@@ -6223,7 +6229,7 @@
 
 #else
 
-	if (MR==Work.MacroWORK && Work.ExecLIBPos>=MR->BufferSize)
+	if (MR && MR==Work.MacroWORK && Work.ExecLIBPos>=MR->BufferSize)
 	{
 		_KEYMACRO(SysLog(-1); SysLog(L"[%d] **** End Of Execute Macro ****",__LINE__));
 		if (--Work.KeyProcess < 0)