v0.14-b3, small changes

23rd · Jan 13, 2021 · 5b099b0 · 5b099b0
1 parent 938988e
commit 5b099b0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/chatty/Chatty.java b/src/chatty/Chatty.java
@@ -57,7 +57,7 @@ public class Chatty {
      * by points. May contain a single "b" for beta versions, which are counted
      * as older (so 0.8.7b4 is older than 0.8.7).
      */
-    public static final String VERSION = "0.14-b2"; // Remember changing the version in the help
+    public static final String VERSION = "0.14-b3"; // Remember changing the version in the help
 
     /**
      * Enable Version Checker (if you compile and distribute this yourself, you

diff --git a/src/chatty/TwitchConnection.java b/src/chatty/TwitchConnection.java
@@ -1214,7 +1214,7 @@ void onQueryMessage(String nick, String from, String text) {
         private void infoMessage(String channel, String text, MsgTags tags) {
             if (tags.isValue("msg-id", "host_on")) {
                 String hostedChannel = channelStates.getState(channel).getHosting();
-                if (hostedChannel != null) {
+                if (!StringUtil.isNullOrEmpty(hostedChannel)) {
                     tags = MsgTags.addTag(tags, "chatty-hosted", hostedChannel);
                 }
             }
@@ -1406,7 +1406,8 @@ public void onChannelCommand(MsgTags tags, String nick,
                 String[] parameters = trailing.split(" ");
                 if (parameters.length == 2) {
                     String target = parameters[0];
-                    if (target.equals("-")) {
+                    // Unhosting should be "-", but just to be safe
+                    if (!Helper.isRegularChannel(target)) {
                         listener.onHost(rooms.getRoom(channel), null);
                         channelStates.setHosting(channel, null);
                     } else {

diff --git a/src/chatty/gui/Channels.java b/src/chatty/gui/Channels.java
@@ -29,10 +29,10 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import chatty.util.dnd.DockPopout;
-import com.sun.glass.events.KeyEvent;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.awt.event.KeyEvent;
 import javax.swing.Icon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;

diff --git a/src/chatty/gui/components/help/help.html b/src/chatty/gui/components/help/help.html
@@ -5,7 +5,7 @@
         <link rel="stylesheet" type="text/css" href="style.css" />
 </head>
 <body>
-    <h1><a name="top">Chatty (Version: 0.14-b2)</a></h1>
+    <h1><a name="top">Chatty (Version: 0.14-b3)</a></h1>
     <table>
         <tr>
             <td valign="top">