Send a Topic discovery if we get an end of names before we get a topic. Fixes issue 3095

src/com/dmdirc/parser/irc/IRCChannelInfo.java

@@ -60,6 +60,8 @@ public class IRCChannelInfo implements ChannelInfo {
     private String sTopicUser = "";
     /** Unixtimestamp representing time when the topic was set. */
     private long nTopicTime = 0;
+    /** Has this channel ever had a topic? */
+    private boolean hadTopic = false;
     
     /** Known boolean-modes for channel. */
     private long nModes;
@@ -191,7 +193,24 @@ public class IRCChannelInfo implements ChannelInfo {
             }
         }
     }
+
     
+    /**
+     * Has this channel ever had a topic? (even an empty one!)
+     * 
+     * @return True if a topic has ever been known for this channel.
+     */
+    public synchronized boolean hadTopic() {
+        return hadTopic;
+    }
+
+    /**
+     * Change the value of hadTopic to true.
+     */
+    public synchronized void setHadTopic() {
+        this.hadTopic = true;
+    }
+
     /**
      * Have we ever asked the server for this channels listmodes?
      *

src/com/dmdirc/parser/irc/ProcessNames.java

@@ -24,6 +24,7 @@ package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNamesListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
 
 /**
  * Process a Names reply.
@@ -43,6 +44,10 @@ public class ProcessNames extends IRCProcessor {
             iChannel = getChannel(token[3]);
             if (iChannel == null) { return; }
             
+            if (!iChannel.hadTopic()) {
+                callChannelTopic(iChannel, true);
+            }
+
             iChannel.setAddingNames(false);
             callChannelGotNames(iChannel);
             
@@ -102,6 +107,19 @@ public class ProcessNames extends IRCProcessor {
         }
     }
     
+    /**
+     * Callback to all objects implementing the ChannelTopic Callback.
+     *
+     * @see IChannelTopic
+     * @param cChannel Channel that topic was set on
+     * @param bIsJoinTopic True when getting topic on join, false if set by user/server
+     * @return true if a method was called, false otherwise
+     */
+    protected boolean callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
+        ((IRCChannelInfo)cChannel).setHadTopic();
+        return getCallbackManager().getCallbackType(ChannelTopicListener.class).call(cChannel, bIsJoinTopic);
+    }
+
     /**
      * Callback to all objects implementing the ChannelGotNames Callback.
      *

src/com/dmdirc/parser/irc/ProcessTopic.java

@@ -78,6 +78,7 @@ public class ProcessTopic extends IRCProcessor {
      * @return true if a method was called, false otherwise
      */
     protected boolean callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
+        ((IRCChannelInfo)cChannel).setHadTopic();
         return getCallbackManager().getCallbackType(ChannelTopicListener.class).call(cChannel, bIsJoinTopic);
     }