Issue #805: fall back to translated button captions if GetLocaleStrin…

…g returned an empty string. Setting an empty button caption raises an exception in TTaskDialogButtonItem
HeidiSQL · Nov 14, 2019 · 6695a31 · 6695a31
1 parent 17f6cb8
commit 6695a31
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/source/apphelpers.pas b/source/apphelpers.pas
@@ -2367,10 +2367,13 @@ function MessageDialog(const Title, Msg: string; DlgType: TMsgDlgType; Buttons:
     cap: String;
   begin
     Btn := TTaskDialogButtonItem(Dialog.Buttons.Add);
+    cap := '';
     if ResourceId > 0 then begin
       // Prefer string from user32.dll
+      // May be empty on Wine!
       cap := GetLocaleString(ResourceId)
-    end else begin
+    end;
+    if cap.IsEmpty then begin
       cap := _(BtnCaption);
       for i:=1 to Length(cap) do begin
         // Auto apply hotkey