[commit] r1554 - trunk/GME/Mga

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Sep 21 09:02:51 2011
New Revision: 1554

Log:
Dont use running objects table

Modified:
   trunk/GME/Mga/MgaProject.cpp
   trunk/GME/Mga/MgaProject.h

Modified: trunk/GME/Mga/MgaProject.cpp
==============================================================================
--- trunk/GME/Mga/MgaProject.cpp	Wed Sep 21 09:02:39 2011	(r1553)
+++ trunk/GME/Mga/MgaProject.cpp	Wed Sep 21 09:02:51 2011	(r1554)
@@ -28,7 +28,6 @@
 			preferences = 0;
 			opmask = 0x0026662A;
 			mgaproject = this;
-			rot = 0;
 			checkoff = false;
 			transactioncount = 0;
 			autoaddons = false;
@@ -209,7 +208,6 @@
 		}
 		COMTHROW(dataproject->FlushUndoQueue());
 		COMTHROW(suhr);
-		COMTHROW(RegisterActiveObject((IMgaProject *)this,CLSID_MgaProject,ACTIVEOBJECT_STRONG,&rot));
 		projconn = projectname;
 		StartAutoAddOns();
 		try {
@@ -343,7 +341,6 @@
 			}
 		}
 		else COMTHROW(E_INVALID_USAGE);
-		COMTHROW(RegisterActiveObject((IMgaProject *)this,CLSID_MgaProject,ACTIVEOBJECT_STRONG,&rot));
 		StartAutoAddOns();
 		try {
 			COMTHROW(BeginTransaction(lm, TRANSACTION_READ_ONLY));
@@ -453,7 +450,6 @@
 			}
 		}
 
-		COMTHROW(RegisterActiveObject((IMgaProject *)this,CLSID_MgaProject,ACTIVEOBJECT_STRONG,&rot));
 		StartAutoAddOns();
 
 		try {
@@ -611,7 +607,6 @@
 		StopAutoAddOns();  // PETER: Moved these two lines here, otherwise addons won't receive notifications
 		RemoveClients();   //
 
-	 	if(rot) COMTHROW(RevokeActiveObject(rot,NULL));
 		if(dataproject) COMTHROW(dataproject->CloseProject(abort));
 
 		if(metapr) {

Modified: trunk/GME/Mga/MgaProject.h
==============================================================================
--- trunk/GME/Mga/MgaProject.h	Wed Sep 21 09:02:39 2011	(r1553)
+++ trunk/GME/Mga/MgaProject.h	Wed Sep 21 09:02:51 2011	(r1554)
@@ -25,7 +25,6 @@
     DEFSIG;
 	CComPtr<IUnknown> inner;
 	CMgaProject *mgaproject;
-	unsigned long rot;
 public:
 	CMgaProject();
 	STDMETHOD(FinalConstruct)();