Fixed issue 103 Automatically reconnect bookmarked conference rooms

pandion · May 13, 2010 · 37d3b20 · 37d3b20
1 parent 5679116
commit 37d3b20
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Client/js/conference-container.js b/Client/js/conference-container.js
@@ -266,7 +266,7 @@ function SessionTracker ( Address )
 		{
 			/* Error
 			 */
-			if ( Event.Type == 'message' && Event.Payload.Type == 'error' )
+			if ( Event.Payload.Type == 'error' )
 			{
 				if ( Event.Payload.ErrorMessage.length )
 				{
@@ -412,7 +412,9 @@ function SessionTracker ( Address )
 			/* Update
 			 */
 			else if ( this.Occupants.Exists( Event.Payload.FromAddress.Resource ) )
+			{
 				this.Occupants( Event.Payload.FromAddress.Resource ).Update( Event.Payload );
+			}
 			/* Add
 			 */
 			else if ( Event.Payload.FromAddress.Resource.length )

diff --git a/Client/src/main/dial_conference.js b/Client/src/main/dial_conference.js
@@ -16,7 +16,7 @@ function dial_conference ( Address, Password, InviteJid, InviteGroup )
 			Tracker.Password = Password;
 			Tracker.SendPresence( external.globals( 'cfg' )( 'lastmode' ), external.globals( 'cfg' )( 'lastmsg' ) );
 		}
-		if ( Tracker.Address.Resource.length && Tracker.Address.Resource != Address.Resource )
+		if ( Address.Resource.length && Tracker.Address.Resource != Address.Resource )
 		{
 			Tracker.Address = Address;
 			Tracker.DrawContainerInfo();