aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/FbString.hh
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2008-08-14 05:52:39 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2008-08-14 05:52:39 (GMT)
commite169d33552c8e7070aa6e13da0187f2013b4cfc3 (patch)
treeae9e92c7e885791c7f47645184070cbcd441ab94 /src/FbTk/FbString.hh
parentc82e7c0080f8a5c14dcf95ec92dc42f59ea9dd8b (diff)
parent91ca3bc5c8e2b892a9a81b18246f72aba7deebfd (diff)
downloadfluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.zip
fluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.tar.bz2
Merge branch 'master' into to_push
Diffstat (limited to 'src/FbTk/FbString.hh')
-rw-r--r--src/FbTk/FbString.hh2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/FbTk/FbString.hh b/src/FbTk/FbString.hh
index 21185f4..1e473cc 100644
--- a/src/FbTk/FbString.hh
+++ b/src/FbTk/FbString.hh
@@ -67,6 +67,8 @@ public:
67 bool setSource(const std::string &encoding); 67 bool setSource(const std::string &encoding);
68 void reset() { 68 void reset() {
69#ifdef HAVE_ICONV 69#ifdef HAVE_ICONV
70 if (m_iconv != ((iconv_t)-1))
71 iconv_close(m_iconv);
70 m_iconv = ((iconv_t)(-1)); 72 m_iconv = ((iconv_t)(-1));
71#endif 73#endif
72 } 74 }