From: ozafy <redacted>
Date: Wed, 20 Apr 2011 15:50:31 +0000 (+0000)
Subject: git-svn-id: https://svn.code.sf.net/p/borknet-dev-com/code/borknet_services/trunk... 
X-Git-Url: https://jfr.im/git/irc/borknet/trunk.git/commitdiff_plain/3986f9519c7cad5a397b368f5a8eae6aef95f51d

git-svn-id: https://svn.code.sf.net/p/borknet-dev-com/code/borknet_services/trunk@95 978df70f-ee2e-0410-be05-84fadda3e4e6
---

diff --git a/CHANGES b/CHANGES
index b599908..e39cf6f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+20/04/2011 REV 95
+Core: Fixed not deleting empty channels
+
 18/03/2011 REV 94
 S: Added remove command.
 X: Fixed userchan references.
diff --git a/compile.bat b/compile.bat
index 458982d..554304f 100644
--- a/compile.bat
+++ b/compile.bat
@@ -3,8 +3,8 @@ rem
 rem Used for compiling on windows.
 rem 
 
-rem set CLASSPATH=D:\java;D:\java\borknet_services\mail.jar;
- set CLASSPATH=D:\work;D:\work\borknet_services\mail.jar;
+ set CLASSPATH=D:\java;D:\java\borknet_services\mail.jar;
+rem set CLASSPATH=D:\work;D:\work\borknet_services\mail.jar;
 
 rem javac *.java
  javac core/*.java
diff --git a/core/CoreDBControl.class b/core/CoreDBControl.class
index 97f4239..c89c46c 100644
Binary files a/core/CoreDBControl.class and b/core/CoreDBControl.class differ
diff --git a/core/CoreDBControl.java b/core/CoreDBControl.java
index 7dc3288..6f4d769 100644
--- a/core/CoreDBControl.java
+++ b/core/CoreDBControl.java
@@ -1415,11 +1415,7 @@ public class CoreDBControl
    ArrayList<String> userchannels = u.getChannels();
    for(String channel: userchannels)
    {
-    Channel c = channels.get(channel.toLowerCase());
-    if(c instanceof Channel)
-    {
-     c.delUser(numer);
-    }
+    delUserChan(channel, numer);
    }
 		}
 		catch ( Exception e )
@@ -1509,6 +1505,10 @@ public class CoreDBControl
   {
    c.delUser(user);
   }
+  if(c.getUsercount()<=0)
+  {
+   channels.remove(chan.toLowerCase());
+  }
   User u = usersByNumeric.get(user);
   if(u instanceof User)
   {