Fixed core dump when compiled with -D_GLIBCXX_ASSERTIONS

2 files changed, 1 insertions, 9 deletions

diff --git a/src/bible.cc b/src/bible.cc
index 4da2326..c2d93b1 100644
--- a/src/bible.cc
+++ b/src/bible.cc
@@ -308,7 +308,7 @@ int main(int argc, char* argv[]) {
         chapter = tex.chapter;
         verse = tex.verse;
         out << tex.text;
-        if(tex.text.back() == '\n') {
+        if(!tex.text.empty() and tex.text.back() == '\n') {
             isNewline = true;
         } else {
             isNewline = false;
diff --git a/src/lib/mods.cc b/src/lib/mods.cc
index ab54e48..07f48da 100644
--- a/src/lib/mods.cc
+++ b/src/lib/mods.cc
@@ -161,14 +161,6 @@ bool libbible::installModFromInternet(string language, string name) {
 #define delim '/'
 
 bool libbible::installModFromZip(string filename) {
-    // So... turns out it's a mite unsupported to install from a .zip
-    // Here's the deal. We do a syscall to unzip. We fancy like that.
-    // TODO: Use the ZipCompress module from SWORD instead.
-    /*string command = "unzip -o " + filename + " -d " + basedir + "&> /dev/null";
-      if(system(command.c_str())) {
-    //Uh oh...
-    printf("Something bad happened when unpacking %s\n. Is unzip installed?", filename.c_str());
-    }*/
     unzFile zipfile = unzOpen(filename.c_str());
     if(zipfile == NULL) {
         return false;