diff options
| author | oldmud0 <3421260-oldmud0@users.noreply.gitlab.com> | 2019-07-20 16:57:27 +0000 |
|---|---|---|
| committer | oldmud0 <3421260-oldmud0@users.noreply.gitlab.com> | 2019-07-20 16:57:27 +0000 |
| commit | e0c49ceb0720fabc777e178e1c8ce76ec7ef42e9 (patch) | |
| tree | e78e7ec82f105e98a7e3f1dab2a5c907e249f877 /src/text_file_functions.cpp | |
| parent | e5c2898bac03c478b468afd765ecbf3ceaa19a46 (diff) | |
| parent | 4a2a167f7d552141a2e3450d350b57d2f7b342a0 (diff) | |
Merge branch 'bass-optional' into 'master'
Bass+discord optional
See merge request AttorneyOnline/AO2-Client!59
Diffstat (limited to 'src/text_file_functions.cpp')
| -rw-r--r-- | src/text_file_functions.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index 18c43ac4..72476255 100644 --- a/src/text_file_functions.cpp +++ b/src/text_file_functions.cpp @@ -453,8 +453,9 @@ QString AOApplication::get_chat(QString p_char) QString AOApplication::get_char_shouts(QString p_char) { QString f_result = read_char_ini(p_char, "shouts", "Options"); - - return f_result; + if (f_result == "") + return "default"; + else return f_result; } int AOApplication::get_preanim_duration(QString p_char, QString p_emote) |