Just put everything new in. Conflict resolution will be later

1 files changed, 4 insertions, 3 deletions

diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
index 08c13c08..eca04985 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
@@ -31,6 +31,7 @@
 						The functions to get the name(s) and icon were removed from the two other classes.

 */

 #include "ftnoir_protocol_fsuipc.h"

+#include "facetracknoir/global-settings.h"

 

 //*******************************************************************************************************

 // FaceTrackNoIR Client Settings-dialog.

@@ -189,9 +190,9 @@ void FSUIPCControls::getLocationOfDLL()
 //   GetProtocolDialog     - Undecorated name, which can be easily used with GetProcAddress

 //                          Win32 API function.

 //   _GetProtocolDialog@0  - Common name decoration for __stdcall functions in C language.

-#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")

+//#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")

 

-FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialogPtr __stdcall GetProtocolDialog( )

+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT void* CALLING_CONVENTION GetDialog(void)

 {

-	return new FSUIPCControls;

+    return (IProtocolDialog*) new FSUIPCControls;

 }