mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
4fb01dd766
Each preferences object owns its string members. In three cases, pointers were copied instead of strings, leading to (in the best case) dangling pointers if the user edited values: 1) In the GET_TXT macro in core/prefs-macros.h 2) In the PreferencesDialog::defaultsRequested() method 3) In main() of the mobile version This patch fixes these issues, by using copy_string() or copy_prefs() as appropriate. The only reason that the old code didn't crash regularly is that the default_prefs object was only used at startup and defaultsRequested() is (at the moment?) dead code. This patch also aligns the backslashes in core/pref.h and fixes a typo. The declaration of copy_prefs() is moved to the core/prefs.h header. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
72 lines
1.7 KiB
C++
72 lines
1.7 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
/* main.c */
|
|
#include <locale.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <time.h>
|
|
|
|
#include "core/dive.h"
|
|
#include "core/qt-gui.h"
|
|
#include "core/subsurfacestartup.h"
|
|
#include "core/color.h"
|
|
#include "core/qthelper.h"
|
|
#include "core/helpers.h"
|
|
#include "core/downloadfromdcthread.h"
|
|
|
|
#include <QStringList>
|
|
#include <QApplication>
|
|
#include <QLoggingCategory>
|
|
#include <git2.h>
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
int i;
|
|
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
|
QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true"));
|
|
QApplication *application = new QApplication(argc, argv);
|
|
(void)application;
|
|
QStringList arguments = QCoreApplication::arguments();
|
|
|
|
subsurface_console_init();
|
|
|
|
for (i = 1; i < arguments.length(); i++) {
|
|
QString a = arguments.at(i);
|
|
if (!a.isEmpty() && a.at(0) == '-') {
|
|
parse_argument(a.toLocal8Bit().data());
|
|
continue;
|
|
}
|
|
}
|
|
git_libgit2_init();
|
|
setup_system_prefs();
|
|
if (uiLanguage(0).contains("-US"))
|
|
default_prefs.units = IMPERIAL_units;
|
|
copy_prefs(&default_prefs, &prefs);
|
|
fill_profile_color();
|
|
fill_computer_list();
|
|
|
|
parse_xml_init();
|
|
taglist_init_global();
|
|
init_ui();
|
|
if (prefs.default_file_behavior == LOCAL_DEFAULT_FILE)
|
|
set_filename(prefs.default_filename, true);
|
|
else
|
|
set_filename(NULL, true);
|
|
|
|
// some hard coded settings
|
|
prefs.animation_speed = 0; // we render the profile to pixmap, no animations
|
|
|
|
// always show the divecomputer reported ceiling in red
|
|
prefs.redceiling = 1;
|
|
|
|
init_proxy();
|
|
|
|
if (!quit)
|
|
run_ui();
|
|
exit_ui();
|
|
taglist_free(g_tag_list);
|
|
parse_xml_exit();
|
|
subsurface_console_exit();
|
|
free_prefs();
|
|
return 0;
|
|
}
|