diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-03-17 22:49:29 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-03-17 16:50:20 -0700 |
| commit | ed3e68c36a94a14d73c81ef7e2ce27ec3ea24217 (patch) | |
| tree | 59466c90c0dc7c5d56681ab8b57a7694484cc824 /mobile-widgets/qmlmanager.cpp | |
| parent | 2042a472303ab33f0fb8a6625d6e69e533dbce43 (diff) | |
| download | subsurface-ed3e68c36a94a14d73c81ef7e2ce27ec3ea24217.tar.gz | |
git: load into arbitrary dive tables
The git parser loads into the global dive table, even if it
is called indirectly via parse_file(). However, parse_file()
may be given a different table. Fix this by extending the
git parser state.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'mobile-widgets/qmlmanager.cpp')
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 8ef135aa8..bc99088ee 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -693,7 +693,7 @@ void QMLManager::loadDivesWithValidCredentials() } if (git != dummy_git_repository) { appendTextToLog(QString("have repository and branch %1").arg(branch)); - error = git_load_dives(git, branch); + error = git_load_dives(git, branch, &dive_table, &trip_table, &dive_site_table); } else { appendTextToLog(QString("didn't receive valid git repo, try again")); error = parse_file(fileNamePrt.data(), &dive_table, &trip_table, &dive_site_table); |