mathed31.diff

[lyx.git] / src / gettext.C

diff --git a/src/gettext.C b/src/gettext.C
index 9d17c623c5e9ed392b07c3212d29a557c4a08582..49158949ce3a10148bbcccefc77478799881b80b 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -7,19 +7,29 @@
 
 char const * _(char const * str)
 {
-       return gettext(str);
+       // I'd rather have an Assert on str, we should not allow
+       // null pointers here. Lgb
+       // Assert(str);
+       if (str && str[0])
+               return gettext(str);
+       else
+               return "";
 }
 
 
 string const _(string const & str) 
 {
-       int const s = str.length();
-       char * tmp = new char[s + 1];
-       str.copy(tmp, s);
-       tmp[s] = '\0';
-       string ret(_(tmp));
-       delete [] tmp;
-       return ret;
+       if (!str.empty()) {
+               int const s = str.length();
+               char * tmp = new char[s + 1];
+               str.copy(tmp, s);
+               tmp[s] = '\0';
+               string ret(gettext(tmp));
+               delete [] tmp;
+               return ret;
+       }
+       else
+               return string();
 }
 
 #endif