diff -I'^// \$Id' -Naur --exclude-from diff-exclude trunk.orig/src/FbTk/FbString.cc trunk.tabs/src/FbTk/FbString.cc --- trunk.orig/src/FbTk/FbString.cc 2006-06-26 20:55:59.000000000 +1000 +++ trunk.tabs/src/FbTk/FbString.cc 2006-07-05 09:37:16.000000000 +1000 @@ -261,7 +261,8 @@ if (newiconv == ((iconv_t)(-1))) return false; else { - iconv_close(m_iconv); + if (m_iconv != ((iconv_t)-1)) + iconv_close(m_iconv); m_iconv = newiconv; return true; }