Merge branch 'main' of https://git.getmemy.coffee/nico/fforte

2024-04-24 17:45:49 +02:00
parent 5e8ed05c41 d6ae86598d
commit e3609deb5f
7 changed files with 234 additions and 86 deletions
--- a/lib/addCam/add_cam_main.dart
+++ b/lib/addCam/add_cam_main.dart
@@ -256,8 +256,12 @@ class _AddCamMainState extends State<AddCamMain> {
                  child: Text(AppLocalizations.of(context)!.template)),
              TextButton(
                  onPressed: () async {
+<<<<<<< HEAD
                    saveData();
+=======
+>>>>>>> d6ae86598dd9d031af9fe29680dc050c5bb2946f
                    _httpRequest();
+                    saveData();
                    Navigator.pushNamedAndRemoveUntil(
                        // ignore: use_build_context_synchronously
                        context,
@@ -268,7 +272,7 @@ class _AddCamMainState extends State<AddCamMain> {
              TextButton(
                  onPressed: () async {
                    saveData();
-                    await saveFile();
+                    saveFile();
                    // ignore: use_build_context_synchronously
                    Navigator.pushNamedAndRemoveUntil(
                        // ignore: use_build_context_synchronously