mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

git: load into arbitrary dive tables

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2020-03-17 22:49:29 +01:00 • committed by Dirk Hohndel
parent 2042a47230
commit ed3e68c36a
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mobile-widgets/qmlmanager.cpp
View file

@ -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);