Fix merge

2025-12-04 15:49:33 +01:00 · 2022-05-19 19:48:43 +02:00
parent a961b41de0
commit 467df2020e
1 changed files with 2 additions and 2 deletions
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
@@ -672,7 +672,7 @@ class Database {
                                    }
                                }
                            }
-                        setDatabaseKDB(databaseToMergeKDB)
+                        databaseToMerge.setDatabaseKDB(databaseToMergeKDB)
                    },
                    { databaseInputStream ->
                        val databaseToMergeKDBX = DatabaseKDBX()
@@ -692,7 +692,7 @@ class Database {
                                }
                            }
                        }
-                        setDatabaseKDBX(databaseToMergeKDBX)
+                        databaseToMerge.setDatabaseKDBX(databaseToMergeKDBX)
                    }
                )
                loaded = true