summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-08-06 22:12:54 +0200
committerAttila Molnar <attilamolnar@hush.com>2014-08-06 22:12:54 +0200
commitbc545cc36b5c75dae769e898e1174994266ecea2 (patch)
tree23c3a0f0732e6950f4be0676fe80940ec82cf0e7 /src/modules
parent2cc3d7ecb8cd77341215db5bb94cebf917a5c5ef (diff)
parent234be2f3cb00735ec07c9df749a0d53effce5f65 (diff)
Merge pull request #899 from SaberUK/insp20+fix-listmode-limits
[2.0] Fix listmodes when the config does not specify a wildcard size entry.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/u_listmode.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/u_listmode.h b/src/modules/u_listmode.h
index 0f5903e53..30bf6a48f 100644
--- a/src/modules/u_listmode.h
+++ b/src/modules/u_listmode.h
@@ -201,13 +201,13 @@ class ListModeBase : public ModeHandler
if (limit.mask.size() && limit.limit > 0)
chanlimits.push_back(limit);
}
- if (chanlimits.empty())
- {
- ListLimit limit;
- limit.mask = "*";
- limit.limit = 64;
- chanlimits.push_back(limit);
- }
+
+ // Add the default entry. This is inserted last so if the user specifies a
+ // wildcard record in the config it will take precedence over this entry.
+ ListLimit limit;
+ limit.mask = "*";
+ limit.limit = 64;
+ chanlimits.push_back(limit);
}
/** Populate the Implements list with the correct events for a List Mode