summaryrefslogtreecommitdiff
path: root/src/gui/models
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-24 01:52:52 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-25 15:07:19 +0300
commit841fe55e67ea467a8e2192dee5c169d282a35148 (patch)
tree2b6731fbab51c7cbc7224dbfa364c462a2528651 /src/gui/models
parent233f2b564e7707f79deb493444f28363ac10bfd4 (diff)
downloadmv-841fe55e67ea467a8e2192dee5c169d282a35148.tar.gz
mv-841fe55e67ea467a8e2192dee5c169d282a35148.tar.bz2
mv-841fe55e67ea467a8e2192dee5c169d282a35148.tar.xz
mv-841fe55e67ea467a8e2192dee5c169d282a35148.zip
Add missing checks into models.
Diffstat (limited to 'src/gui/models')
-rw-r--r--src/gui/models/colormodel.cpp2
-rw-r--r--src/gui/models/namesmodel.cpp2
-rw-r--r--src/gui/models/serverslistmodel.h3
3 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/models/colormodel.cpp b/src/gui/models/colormodel.cpp
index 212ed5227..f7b18d300 100644
--- a/src/gui/models/colormodel.cpp
+++ b/src/gui/models/colormodel.cpp
@@ -70,6 +70,8 @@ void ColorModel::add(const std::string &name, const Color *const color1,
ColorModel *ColorModel::createDefault(const Widget2 *const widget)
{
ColorModel *const model = new ColorModel();
+ if (!widget)
+ return model;
// TRANSLATORS: color name
addColor(_("black"), BLACK);
// TRANSLATORS: color name
diff --git a/src/gui/models/namesmodel.cpp b/src/gui/models/namesmodel.cpp
index ed0d78269..b3137d264 100644
--- a/src/gui/models/namesmodel.cpp
+++ b/src/gui/models/namesmodel.cpp
@@ -47,6 +47,8 @@ std::string NamesModel::getElementAt(int i)
void NamesModel::fillFromArray(const char *const *const arr, std::size_t sz)
{
+ if (!arr)
+ return;
for (size_t f = 0; f < sz; f ++)
mNames.push_back(gettext(arr[f]));
}
diff --git a/src/gui/models/serverslistmodel.h b/src/gui/models/serverslistmodel.h
index 864cc70c6..d3d0aec26 100644
--- a/src/gui/models/serverslistmodel.h
+++ b/src/gui/models/serverslistmodel.h
@@ -42,7 +42,8 @@ class ServersListModel final : public ListModel
ServersListModel(ServerInfos *const servers,
ServerDialog *const parent) :
mServers(servers),
- mVersionStrings(servers->size(), VersionString(0, "")),
+ mVersionStrings(servers ? servers->size() : 0,
+ VersionString(0, "")),
mParent(parent)
{
}