From 9ac33c26205d9a05f756cea115778a36b8a5a9ab Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Sun, 19 Jan 2020 21:56:49 +0100 Subject: GUI/gamelist: add "None" as an option for second row and remove dynamically duplicate row options (#3309) * GUI/gamelist: add "None" as an option for second row and remove duplicated row options * fix clang-format warnings --- src/yuzu/game_list_p.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/yuzu/game_list_p.h') diff --git a/src/yuzu/game_list_p.h b/src/yuzu/game_list_p.h index 1c2b37afd..7cde72d1b 100644 --- a/src/yuzu/game_list_p.h +++ b/src/yuzu/game_list_p.h @@ -108,11 +108,14 @@ public: }}; const auto& row1 = row_data.at(UISettings::values.row_1_text_id); - const auto& row2 = row_data.at(UISettings::values.row_2_text_id); + const int row2_id = UISettings::values.row_2_text_id; - if (row1.isEmpty() || row1 == row2) - return row2; - if (row2.isEmpty()) + if (row2_id == 4) // None + return row1; + + const auto& row2 = row_data.at(row2_id); + + if (row1 == row2) return row1; return QString(row1 + QStringLiteral("\n ") + row2); -- cgit v1.2.3