Fixed Clip

sammyfreg · sammyfreg · commit 1b626f0c989d · 2024-12-11T18:52:45.000-05:00
diff --git a/Code/Client/NetImgui_Api.h b/Code/Client/NetImgui_Api.h
@@ -8,7 +8,7 @@
 //!	@version	: v1.12.1
 //! @Details	: For integration info : https://github.com/sammyfreg/netImgui/wiki
 //=================================================================================================
-#define NETIMGUI_VERSION		"1.12.1"	// Fixed a disconnect thread contention issue on socket
+#define NETIMGUI_VERSION		"1.12.1"	// Fixed disconnect thread contention and clipboard command
 #define NETIMGUI_VERSION_NUM	11201
 
 
diff --git a/Code/ServerApp/Source/NetImguiServer_Network.cpp b/Code/ServerApp/Source/NetImguiServer_Network.cpp
@@ -168,8 +168,11 @@ void Communications_Outgoing(RemoteClient::Client& Client)
 	if( Client.mPendingSend.IsReady() )
 	{
 		NetImgui::Internal::CmdClipboard* pClipboardCmd = Client.TakePendingClipboard();
-		Client.mPendingSend.pCommand 					= pClipboardCmd;
-		Client.mPendingSend.bAutoFree					= true;
+		if( pClipboardCmd ){
+			pClipboardCmd->ToOffsets();
+			Client.mPendingSend.pCommand 				= pClipboardCmd;
+			Client.mPendingSend.bAutoFree				= true;
+		}
 	}
 
 	if( Client.mPendingSend.IsReady() )

Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,11 @@ void Communications_Outgoing(RemoteClient::Client& Client)`
`168`	`168`	`if( Client.mPendingSend.IsReady() )`
`169`	`169`	`{`
`170`	`170`	`NetImgui::Internal::CmdClipboard* pClipboardCmd = Client.TakePendingClipboard();`
`171`		`- Client.mPendingSend.pCommand = pClipboardCmd;`
`172`		`- Client.mPendingSend.bAutoFree = true;`
	`171`	`+ if( pClipboardCmd ){`
	`172`	`+ pClipboardCmd->ToOffsets();`
	`173`	`+ Client.mPendingSend.pCommand = pClipboardCmd;`
	`174`	`+ Client.mPendingSend.bAutoFree = true;`
	`175`	`+ }`
`173`	`176`	`}`
`174`	`177`
`175`	`178`	`if( Client.mPendingSend.IsReady() )`