Changeset 601e813 for protocols/msn/sb.c

Timestamp:

2006-05-24T23:04:18Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

80c1e4d

Parents:

46ad029 (diff), fc630f9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

[merge] Wilmer

File:

• protocols/msn/sb.c (modified) (2 diffs)

protocols/msn/sb.c

@@ -202 +202 @@
         debug( "Destroying switchboard: %s", sb->who ? sb->who : sb->key ? sb->key : "" );
         
-        if( sb->key ) g_free( sb->key );
-        if( sb->who ) g_free( sb->who );
-        
         if( sb->msgq )
         {
@@ -222 +219 @@
                 serv_got_crap( gc, "Warning: Closing down MSN switchboard connection with "
                                    "unsent message to %s, you'll have to resend it.",
-                                   m->who ? m->who : "(unknown)" );
-        }
+                                   sb->who ? sb->who : "(unknown)" );
+        }
+        
+        if( sb->key ) g_free( sb->key );
+        if( sb->who ) g_free( sb->who );
         
         if( sb->chat )