aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsimonb <simonb>2007-08-04 18:20:38 (GMT)
committersimonb <simonb>2007-08-04 18:20:38 (GMT)
commit8e7a3936c790aada8b79a7bc26f05571bad5efde (patch)
treeaafb50a5c24611798298c4e330fa86341bcafa0e /src
parentaac5a16bb88b25a050a3819259e0fb2404742daa (diff)
downloadfluxbox-8e7a3936c790aada8b79a7bc26f05571bad5efde.zip
fluxbox-8e7a3936c790aada8b79a7bc26f05571bad5efde.tar.bz2
sync with trunk
Diffstat (limited to 'src')
-rw-r--r--src/FbTk/XrmDatabaseHelper.hh3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/FbTk/XrmDatabaseHelper.hh b/src/FbTk/XrmDatabaseHelper.hh
index 6c8acb0..7ad512d 100644
--- a/src/FbTk/XrmDatabaseHelper.hh
+++ b/src/FbTk/XrmDatabaseHelper.hh
@@ -48,6 +48,9 @@ public:
48 48
49 /// assignment operator 49 /// assignment operator
50 XrmDatabaseHelper& operator=(const XrmDatabase& database) { 50 XrmDatabaseHelper& operator=(const XrmDatabase& database) {
51 if (database == m_database) // assignment to self
52 return *this;
53
51 if (m_database!=0) 54 if (m_database!=0)
52 close(); 55 close();
53 m_database = database; 56 m_database = database;