From a6e3fcc6e394137cbc19881e14e957582bf22826 Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Fri, 24 Dec 2021 14:58:24 +0100
Subject: [PATCH] Fix model groups not exported from server but from local
 config

---
 .../ui/tabs/recorded/AbstractRecordedModelsTab.java       | 8 +++-----
 .../java/ctbrec/ui/tabs/recorded/ModelImportExport.java   | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/client/src/main/java/ctbrec/ui/tabs/recorded/AbstractRecordedModelsTab.java b/client/src/main/java/ctbrec/ui/tabs/recorded/AbstractRecordedModelsTab.java
index df79896d..6a3f7c61 100644
--- a/client/src/main/java/ctbrec/ui/tabs/recorded/AbstractRecordedModelsTab.java
+++ b/client/src/main/java/ctbrec/ui/tabs/recorded/AbstractRecordedModelsTab.java
@@ -4,10 +4,7 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.eventbus.Subscribe;
-import ctbrec.Config;
-import ctbrec.GlobalThreadPool;
-import ctbrec.Model;
-import ctbrec.StringUtil;
+import ctbrec.*;
 import ctbrec.event.EventBusHolder;
 import ctbrec.recorder.Recorder;
 import ctbrec.sites.Site;
@@ -228,7 +225,8 @@ public abstract class AbstractRecordedModelsTab extends Tab implements TabSelect
         ExportOptions exportOptions = new ModelExportDialog(getTabPane()).showAndWait();
         if (exportOptions != null) {
             try {
-                ModelImportExport.exportTo(getExportList(), config, exportOptions);
+                var groups = recorder.getModelGroups();
+                ModelImportExport.exportTo(getExportList(), groups, config, exportOptions);
             } catch (IOException e) {
                 String msg = "An error occurred while exporting the model list";
                 Dialogs.showError(getTabPane().getScene(), "Export models", msg, e);
diff --git a/client/src/main/java/ctbrec/ui/tabs/recorded/ModelImportExport.java b/client/src/main/java/ctbrec/ui/tabs/recorded/ModelImportExport.java
index 74ae4d1a..c2c867c0 100644
--- a/client/src/main/java/ctbrec/ui/tabs/recorded/ModelImportExport.java
+++ b/client/src/main/java/ctbrec/ui/tabs/recorded/ModelImportExport.java
@@ -40,7 +40,7 @@ public class ModelImportExport {
     private ModelImportExport() {
     }
 
-    public static void exportTo(List<Model> models, Config config, ExportOptions exportOptions) throws IOException {
+    public static void exportTo(List<Model> models, Set<ModelGroup> groups, Config config, ExportOptions exportOptions) throws IOException {
         Moshi moshi = new Moshi.Builder()
                 .add(Model.class, new ModelJsonAdapter())
                 .add(File.class, new FileJsonAdapter())
@@ -62,7 +62,7 @@ public class ModelImportExport {
             }
             if (exportOptions.includes().contains(ExportIncludes.GROUPS)) {
                 writer.name("groups");
-                modelGroupAdapter.toJson(writer, config.getSettings().modelGroups);
+                modelGroupAdapter.toJson(writer, groups);
             }
             if (exportOptions.includes().contains(ExportIncludes.PORTRAITS)) {
                 var portraits = config.getSettings().modelPortraits;