projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Reorder slightly for consistency
[quassel.git]
/
src
/
uisupport
/
networkmodelcontroller.cpp
diff --git
a/src/uisupport/networkmodelcontroller.cpp
b/src/uisupport/networkmodelcontroller.cpp
index
bb6482c
..
94dd8d9
100644
(file)
--- a/
src/uisupport/networkmodelcontroller.cpp
+++ b/
src/uisupport/networkmodelcontroller.cpp
@@
-363,7
+363,7
@@
void NetworkModelController::handleHideAction(ActionType type, QAction *action)
return;
case HideApplyToAll:
BufferSettings().setMessageFilter(filter);
return;
case HideApplyToAll:
BufferSettings().setMessageFilter(filter);
- [[clang::fallthrough]];
+ // fallthrough
case HideUseDefaults:
if (_messageFilter)
BufferSettings(_messageFilter->idString()).removeFilter();
case HideUseDefaults:
if (_messageFilter)
BufferSettings(_messageFilter->idString()).removeFilter();
@@
-412,8
+412,10
@@
void NetworkModelController::handleGeneralAction(ActionType type, QAction *actio
break;
}
case ShowChannelList:
break;
}
case ShowChannelList:
- if (networkId.isValid())
- emit showChannelList(networkId, {});
+ if (networkId.isValid()) {
+ // Don't immediately list channels, allowing customization of filter first
+ emit showChannelList(networkId, {}, false);
+ }
break;
case ShowNetworkConfig:
if (networkId.isValid())
break;
case ShowNetworkConfig:
if (networkId.isValid())