summaryrefslogtreecommitdiff
path: root/plot/vrml.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-23 12:22:51 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-23 12:22:51 +0200
commitbc3604d9b226ac475a104cd8ae2ca2d1d4a27984 (patch)
treee796661f371a94a50edfdc693388bb911b253dfd /plot/vrml.c
parent509016be676f7915d635fa57144d2a441e3090ca (diff)
parentc0b89ac5bfb90835ef01573267020e42d4fe070c (diff)
Merge new upstream release
Diffstat (limited to 'plot/vrml.c')
-rwxr-xr-x[-rw-r--r--]plot/vrml.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/plot/vrml.c b/plot/vrml.c
index b077cdb..5b3f9a1 100644..100755
--- a/plot/vrml.c
+++ b/plot/vrml.c
@@ -1314,8 +1314,10 @@ static void check_format() {
/* Return the global format file extension */
static char *ret_ext(vrml_fmt fmt) {
- if (fmt == fmt_uninit)
+ if (fmt == fmt_uninit) {
check_format();
+ fmt = g_fmt;
+ }
if (fmt == fmt_x3dom)
return ".x3d.html";
@@ -1327,8 +1329,10 @@ static char *ret_ext(vrml_fmt fmt) {
/* Return the global format type name */
static char *ret_format(vrml_fmt fmt) {
- if (fmt == fmt_uninit)
+ if (fmt == fmt_uninit) {
check_format();
+ fmt = g_fmt;
+ }
if (fmt == fmt_x3dom)
return "X3DOM";