Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging

2023-08-14 18:16:13 +02:00
parent a44cb6430e ce2ca13815
commit 779f70057b
10 changed files with 22 additions and 29 deletions
--- a/launcher/minecraft/PackProfile.cpp
+++ b/launcher/minecraft/PackProfile.cpp
@ -591,10 +591,7 @@ QVariant PackProfile::data(const QModelIndex &index, int role) const
    }
    case Qt::DecorationRole:
    {
-        switch(column)
-        {
-        case NameColumn:
-        {
+        if (column == NameColumn) {
            auto severity = patch->getProblemSeverity();
            switch (severity)
            {
@ -606,11 +603,7 @@ QVariant PackProfile::data(const QModelIndex &index, int role) const
                    return QVariant();
            }
        }
-        default:
-        {
-            return QVariant();
-        }
-        }
+        return QVariant();
    }
    }
    return QVariant();
--- a/launcher/minecraft/World.h
+++ b/launcher/minecraft/World.h
@ -28,7 +28,7 @@ struct GameType {
    enum
    {
        Unknown = -1,
-        Survival = 0,
+        Survival,
        Creative,
        Adventure,
        Spectator