Browse Source

mtree: replace tree structure even there are no records in db table

- reload didn't replaced old tree if no records in db table
- reported by Juha Heinanen
Daniel-Constantin Mierla 11 years ago
parent
commit
c36f326d3c
1 changed files with 4 additions and 4 deletions
  1. 4 4
      modules/mtree/mtree_mod.c

+ 4 - 4
modules/mtree/mtree_mod.c

@@ -555,8 +555,7 @@ static int mt_load_db(m_tree_t *pt)
 		} else {
 		} else {
 			if(RES_ROW_N(db_res)==0)
 			if(RES_ROW_N(db_res)==0)
 			{
 			{
-				mt_dbf.free_result(db_con, db_res);
-				return 0;
+				goto dbreloaded;
 			}
 			}
 		}
 		}
 	} else {
 	} else {
@@ -566,8 +565,7 @@ static int mt_load_db(m_tree_t *pt)
 		{
 		{
 			if(ret==0)
 			if(ret==0)
 			{
 			{
-				mt_dbf.free_result(db_con, db_res);
-				return 0;
+				goto dbreloaded;
 			} else {
 			} else {
 				goto error;
 				goto error;
 			}
 			}
@@ -622,6 +620,8 @@ static int mt_load_db(m_tree_t *pt)
 			break;
 			break;
 		}
 		}
 	}  while(RES_ROW_N(db_res)>0);
 	}  while(RES_ROW_N(db_res)>0);
+
+dbreloaded:
 	mt_dbf.free_result(db_con, db_res);
 	mt_dbf.free_result(db_con, db_res);