Fix private chat being closed on pop-out

Author: parg

core/src/com/biglybt/plugin/net/buddy/BuddyPluginBeta.java

@@ -3304,7 +3304,7 @@ public void perform(TimerEvent e){
 
 		private volatile String		last_bind_fail = null;
 
-		private boolean		destroyed;
+		private volatile boolean		destroyed;
 
 		private
 		ChatInstance(
@@ -3440,9 +3440,14 @@ public void perform(TimerEvent e){
 
 		protected void
 		addReference()
-		{
+		{			
 			synchronized( chat_lock ){
 
+				if ( isDestroyed()){
+					
+					Debug.out( "Adding reference to a destroyed chat..." );
+				}
+
 				if ( virtual_reference_count > 0 ){
 
 					virtual_reference_count--;
@@ -6480,7 +6485,7 @@ public void perform(TimerEvent event) {
 
 		public boolean
 		isDestroyed()
-		{
+		{				
 			return( destroyed );
 		}
 
@@ -6494,6 +6499,8 @@ public void perform(TimerEvent event) {
 		destroy(
 			boolean		force )
 		{
+			boolean do_destroy;
+
 			synchronized( chat_lock ){
 
 				if ( force ){
@@ -6513,86 +6520,94 @@ public void perform(TimerEvent event) {
 						return;
 					}
 				}
-			}
-
-			if ( !( keep_alive || (have_interest && !is_private_chat ))){
+				
+				if ( !( keep_alive || (have_interest && !is_private_chat ))){
 
-				if ( !destroyed ) {
+					do_destroy = !destroyed;
 
-					destroyed = true;
-	
-					for ( ChatListener l: listeners ){
+					if ( do_destroy ){
+					
+						destroyed = true;
+					}
+				}else{
+					
+					do_destroy = false;
+				}
+			}
 
-						try{
-							l.stateChanged( false );
+			if ( do_destroy ){
+				
+				for ( ChatListener l: listeners ){
 
-						}catch( Throwable e ){
+					try{
+						l.stateChanged( false );
 
-							Debug.out( e );
-						}
+					}catch( Throwable e ){
+
+						Debug.out( e );
 					}
-					
-					try{
-						if ( handler != null ){
-		
-							if ( is_private_chat ){
-		
-								Map<String,Object>		flags = new HashMap<>();
-		
-								flags.put( FLAGS_MSG_STATUS_KEY, FLAGS_MSG_STATUS_CHAT_QUIT );
-		
-								sendMessageSupport( "", flags, new HashMap<String, Object>());
-							}
-		
-							Map<String,Object>		options = new HashMap<>();
+				}
+				
+				try{
+					if ( handler != null ){
 
-							options.put( "handler", handler );
-		
-							Map<String,Object> reply = (Map<String,Object>)msgsync_pi.getIPC().invoke( "removeMessageHandler", new Object[]{ options } );
-						}
-					}catch( Throwable e ){
+						if ( is_private_chat ){
 
-						Debug.out( e );
+							Map<String,Object>		flags = new HashMap<>();
 
-					}finally{
+							flags.put( FLAGS_MSG_STATUS_KEY, FLAGS_MSG_STATUS_CHAT_QUIT );
+	
+							sendMessageSupport( "", flags, new HashMap<String, Object>());
+						}
+	
+						Map<String,Object>		options = new HashMap<>();
+
+						options.put( "handler", handler );
 
-						String meta_key = network + ":" + key;
+						Map<String,Object> reply = (Map<String,Object>)msgsync_pi.getIPC().invoke( "removeMessageHandler", new Object[]{ options } );
+					}
+				}catch( Throwable e ){
+
+					Debug.out( e );
 
-						ChatInstance	removed = null;
+				}finally{
 
-						synchronized( chat_instances_map ){
+					String meta_key = network + ":" + key;
 
-							ChatInstance inst = chat_instances_map.remove( meta_key );
+					ChatInstance	removed = null;
 
-							if ( inst != null ){
+					synchronized( chat_instances_map ){
 
-								removed = inst;
+						ChatInstance inst = chat_instances_map.remove( meta_key );
 
-								chat_instances_list.remove( inst );
-							}
+						if ( inst != null ){
 
-							if ( chat_instances_map.size() == 0 ){
+							removed = inst;
 
-								if ( timer != null ){
+							chat_instances_list.remove( inst );
+						}
 
-									timer.cancel();
+						if ( chat_instances_map.size() == 0 ){
 
-									timer = null;
-								}
+							if ( timer != null ){
+
+								timer.cancel();
+
+								timer = null;
 							}
 						}
+					}
 
-						if ( removed != null ){
+					if ( removed != null ){
 
-							for ( ChatManagerListener l: BuddyPluginBeta.this.listeners ){
+						for ( ChatManagerListener l: BuddyPluginBeta.this.listeners ){
 
-								try{
-									l.chatRemoved( removed );
+							try{
+								l.chatRemoved( removed );
 
-								}catch( Throwable e ){
+							}catch( Throwable e ){
 
-									Debug.out( e );
-								}
+								Debug.out( e );
 							}
 						}
 					}

uis/src/com/biglybt/ui/swt/plugin/net/buddy/swt/SBC_ChatOverview.java

@@ -34,6 +34,8 @@
 import com.biglybt.core.util.Base32;
 import com.biglybt.core.util.Debug;
 import com.biglybt.core.util.GeneralUtils;
+import com.biglybt.core.util.SimpleTimer;
+import com.biglybt.core.util.SystemTime;
 import com.biglybt.pifimpl.local.PluginInitializer;
 import com.biglybt.plugin.net.buddy.BuddyPluginBeta;
 import com.biglybt.plugin.net.buddy.BuddyPluginBeta.ChatInstance;
@@ -258,7 +260,31 @@ public class SBC_ChatOverview
 				options.put( PopOutManager.OPT_ON_TOP, on_top );
 				options.put( PopOutManager.OPT_CAN_MINIMIZE, true );
 
-				mdi.popoutEntryByID("Chat_", chat, options );
+				ChatInstance clone = null;
+				
+				try{
+						// unfortunately the popup process can create an intermediate mdi chat view
+						// that gets destroyed before the popup opens so we need to retain a reference
+						// to the chat during this process :(
+					
+					clone = chat.getClone();
+				
+					mdi.popoutEntryByID("Chat_", chat, options );
+					
+				}finally{
+					
+					if ( clone != null ){
+						
+						ChatInstance fclone = clone;
+						
+						SimpleTimer.addEvent( 
+							"chatdestroy", 
+							SystemTime.getOffsetTime( 10*1000 ), 
+							(ev)->{
+								fclone.destroy();
+							});
+					}
+				}
 			}
 		}catch( Throwable e ){