From 0ea0272806e6a651782f17ecb75fd1345e2ca8cb Mon Sep 17 00:00:00 2001 From: Martin Gysel Date: Thu, 13 Oct 2016 13:39:58 +0200 Subject: TeX export: check site pointer, before accessing it Print empty string rather than 'null' Signed-off-by: Martin Gysel Signed-off-by: Dirk Hohndel --- desktop-widgets/divelogexportdialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp index 9d3d27129..6121bd9eb 100644 --- a/desktop-widgets/divelogexportdialog.cpp +++ b/desktop-widgets/divelogexportdialog.cpp @@ -282,7 +282,7 @@ void DiveLogExportDialog::export_TeX(const char *filename, const bool selected_o put_format(&buf, "\\def\\date{%04u-%02u-%02u}\n", tm.tm_year, tm.tm_mon+1, tm.tm_mday); put_format(&buf, "\\def\\number{%d}\n", dive->number); - put_format(&buf, "\\def\\place{%s}\n", site->name); + put_format(&buf, "\\def\\place{%s}\n", site ? site->name : ""); put_format(&buf, "\\def\\spot{}\n"); put_format(&buf, "\\def\\country{}\n"); put_format(&buf, "\\def\\entrance{}\n"); @@ -293,8 +293,8 @@ void DiveLogExportDialog::export_TeX(const char *filename, const bool selected_o put_format(&buf, "\\def\\type{%s}\n", dive->tag_list ? dive->tag_list->tag->name : ""); put_format(&buf, "\\def\\viz{%s}\n", viz.toUtf8().data()); put_format(&buf, "\\def\\plot{\\includegraphics[width=9cm,height=4cm]{profile%d}}\n", dive->number); - put_format(&buf, "\\def\\comment{%s}\n", dive->notes); - put_format(&buf, "\\def\\buddy{%s}\n", dive->buddy); + put_format(&buf, "\\def\\comment{%s}\n", dive->notes ? dive->notes : ""); + put_format(&buf, "\\def\\buddy{%s}\n", dive->buddy ? dive->buddy : ""); put_format(&buf, "\\page\n"); } -- cgit v1.2.3-70-g09d2