- fixed notifier close button

- fixed crash bug on missing pixmap
- fixed doc for $chan.matchmask

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4920 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 11 insertions, 14 deletions

diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 11308d33c..41ab4e542 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -1635,15 +1635,12 @@ static bool chan_kvs_fnc_matchqban(KviKvsModuleFunctionCall * c)
 	@syntax:
 		<string> $chan.matchmask(<mode:char>,<complete_mask:string>[,window_id])
 	@description:
-
-		Some networks use +q channel mode to set "mute bans".[br]
-		When an user mask matches such a ban, he won't be able to send messages to the channel.[br]
-		The "mute bans" masks will be inserted in the normal channel bans list, with a percent sign % prepended
-		This function returns the "mute ban" mask that matches <complete_mask> on channel identified by [window_id].[br]
-		If no ban mask matches <complete_mask> an empty string is returned.[br]
+		Matches the provided <complete_mask> agains the mask list for channel mode <mode> on the channel identified by [window_id].[br]
+		If no mask matches <complete_mask> an empty string is returned.[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty string is returned.[br]
-		This function is useful to determine if a "mute ban" set on the channel matches an user.[br]
+		Please note that some irc servers use channel list modes not only to store masks, but also for other data such
+		as nicknames. This function should be able to match them as long as they are strings.[br]
 */
 static bool chan_kvs_fnc_matchmask(KviKvsModuleFunctionCall * c)
 {
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 41bb0d92e..ddaf7454c 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -708,8 +708,11 @@ void KviNotifierWindow::mousePressEvent(QMouseEvent * e)
 	}
 
 	if(checkResizing(m_pntClick))
+	{
 		update();
-
+		return;
+	}
+	
 	if(m_pWndBorder->captionRect().contains(e->pos()))
 	{
 		if(m_pWndBorder->closeRect().contains(e->pos()))
@@ -717,6 +720,7 @@ void KviNotifierWindow::mousePressEvent(QMouseEvent * e)
 			m_bCloseDown = true;
 			m_pWndBorder->setCloseIcon(WDG_ICON_CLICKED);
 			update();
+			return;
 		}
 
 		if(!m_bResizing)
@@ -725,16 +729,12 @@ void KviNotifierWindow::mousePressEvent(QMouseEvent * e)
 			m_pntDrag = cursor().pos();
 			m_pntPos = pos();
 			update();
+			return;
 		}
 	}
 
-	if(m_pWndBorder->rect().contains(e->pos()))
-		update();
-
-	if(bWasBlinkOn)
+	if(m_pWndBorder->rect().contains(e->pos()) || bWasBlinkOn)
 		update();
-	else
-		return;
 }
 
 void KviNotifierWindow::mouseReleaseEvent(QMouseEvent * e)