From 83b464f68e40b7e9e3fbd3ee0a4c05b6c55385c7 Mon Sep 17 00:00:00 2001
From: TheLavaBlock <36247472+TheLavaBlock@users.noreply.github.com>
Date: Wed, 6 Nov 2019 00:44:57 +0100
Subject: [PATCH] clean
---
liblava/util/file.cpp | 4 ++++
liblava/util/file.hpp | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/liblava/util/file.cpp b/liblava/util/file.cpp
index 3d5e0646..abae3516 100644
--- a/liblava/util/file.cpp
+++ b/liblava/util/file.cpp
@@ -132,6 +132,10 @@ bool file_system::initialize(name argv_0, name org_, name app_, name ext_) {
PHYSFS_setSaneConfig(org_, app_, ext_, 0, 0);
initialized = true;
+
+ org = org_;
+ app = app_;
+ ext = ext_;
}
return initialized;
diff --git a/liblava/util/file.hpp b/liblava/util/file.hpp
index 8556b13c..93272db5 100644
--- a/liblava/util/file.hpp
+++ b/liblava/util/file.hpp
@@ -35,7 +35,7 @@ bool remove_existing_path(string& target, string_ref path);
struct file_guard : no_copy_no_move {
- explicit file_guard(name filename = nullptr) : filename(filename) {}
+ explicit file_guard(name filename = "") : filename(filename) {}
explicit file_guard(string filename) : filename(filename) {}
~file_guard() {
@@ -44,7 +44,7 @@ struct file_guard : no_copy_no_move {
fs::remove(filename);
}
- string filename = nullptr;
+ string filename;
bool remove = true;
};
--
GitLab