refactor contact form

1 files changed, 9 insertions, 3 deletions

diff --git a/src/ui/ui_settings.cpp b/src/ui/ui_settings.cpp
index c2c34b9..c222dbb 100644
--- a/src/ui/ui_settings.cpp
+++ b/src/ui/ui_settings.cpp
@@ -7,7 +7,7 @@
 #include "administration.hpp"
 #include "locales.hpp"
 
-extern bool draw_contact_form(contact* buffer, bool back_button_enabled = true, bool viewing_only = false);
+extern void draw_contact_form(contact* buffer, bool viewing_only = false);
 
 static contact company_info;
 
@@ -312,11 +312,17 @@ void ui_draw_settings()
     {
         if (ImGui::BeginTabItem(localize("settings.table.company")))
         {
-            bool save = draw_contact_form(&company_info, false);
+            draw_contact_form(&company_info);
 
-            if (save) {
+            // Save button.
+            bool can_save = administration_is_contact_valid(company_info);
+            if (!can_save) ImGui::BeginDisabled();
+            ImGui::Spacing();
+            if (ImGui::Button(localize("form.save"))) {
                 administration_set_company_info(company_info);
             }
+            if (!can_save) ImGui::EndDisabled();
+
             ImGui::EndTabItem();
         }
         if (ImGui::BeginTabItem(localize("settings.table.vatrates")))