[Tux4kids-commits] r1454 - in tux4kids-admin/trunk: libtux4kidsadmin tux4kids-admin/src

[Michał Świtakowski]

Author: swistakers-guest
Date: 2009-08-17 13:42:58 +0000 (Mon, 17 Aug 2009)
New Revision: 1454

Modified:
   tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp
   tux4kids-admin/trunk/libtux4kidsadmin/profileDirFactory.cpp
   tux4kids-admin/trunk/libtux4kidsadmin/schoolData.cpp
   tux4kids-admin/trunk/libtux4kidsadmin/studentDir.cpp
   tux4kids-admin/trunk/tux4kids-admin/src/mainController.cpp
Log:
fixed some segmentation faults

Modified: tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp	2009-08-17 06:48:14 UTC (rev 1453)
+++ tux4kids-admin/trunk/libtux4kidsadmin/profileDir.cpp	2009-08-17 13:42:58 UTC (rev 1454)
@@ -7,7 +7,8 @@
 /****************** ProfileDirPrivate *******************/
 
 ProfileDirPrivate::ProfileDirPrivate(QString path)
-		: status(ProfileDir::NoError)
+		: status(ProfileDir::NoError),
+		attributes(0)
 {
 	mainDir.setPath(path);
 	if (!mainDir.exists()) {

Modified: tux4kids-admin/trunk/libtux4kidsadmin/profileDirFactory.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/profileDirFactory.cpp	2009-08-17 06:48:14 UTC (rev 1453)
+++ tux4kids-admin/trunk/libtux4kidsadmin/profileDirFactory.cpp	2009-08-17 13:42:58 UTC (rev 1454)
@@ -14,7 +14,6 @@
 	~ProfileDirFactoryCleaner()
 	{
 		ProfileDirFactory::destroy();
-		qDebug() << "destroying ProfileDirFactory";
 	}
 };
 

Modified: tux4kids-admin/trunk/libtux4kidsadmin/schoolData.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/schoolData.cpp	2009-08-17 06:48:14 UTC (rev 1453)
+++ tux4kids-admin/trunk/libtux4kidsadmin/schoolData.cpp	2009-08-17 13:42:58 UTC (rev 1454)
@@ -12,7 +12,8 @@
 /****************** SchoolDataPrivate *******************/
 
 SchoolDataPrivate::SchoolDataPrivate(QString path)
-		: status(SchoolData::NoError)
+		: status(SchoolData::NoError),
+		attributes(0)
 {
 	mainDir.setPath(path);
 	if (!mainDir.exists()) {

Modified: tux4kids-admin/trunk/libtux4kidsadmin/studentDir.cpp
===================================================================
--- tux4kids-admin/trunk/libtux4kidsadmin/studentDir.cpp	2009-08-17 06:48:14 UTC (rev 1453)
+++ tux4kids-admin/trunk/libtux4kidsadmin/studentDir.cpp	2009-08-17 13:42:58 UTC (rev 1454)
@@ -10,6 +10,7 @@
 
 StudentDirPrivate::StudentDirPrivate(QString path) :
 		status(StudentDir::NoError),
+		attributes(0),
 		computerNumber(-1)
 {
 	mainDir.setPath(path);

Modified: tux4kids-admin/trunk/tux4kids-admin/src/mainController.cpp
===================================================================
--- tux4kids-admin/trunk/tux4kids-admin/src/mainController.cpp	2009-08-17 06:48:14 UTC (rev 1453)
+++ tux4kids-admin/trunk/tux4kids-admin/src/mainController.cpp	2009-08-17 13:42:58 UTC (rev 1454)
@@ -59,7 +59,17 @@
 		qDebug() << tr("Failed to load plugins");
 	}
 
+	if (schoolDataPath.isEmpty()) {
+		m_status = InitializtionError;
+		return;
+	}
+
 	m_schoolData = new SchoolData(schoolDataPath);
+	if (m_schoolData->status() != SchoolData::NoError) {
+		m_status = InitializtionError;
+		return;
+	}
+
 	m_studentTableModel.setSchoolData(m_schoolData);
 	m_classTableModel.setSchoolDatabase(m_schoolData->schoolDatabase());
 	m_teacherTableModel.setSchoolDatabase(m_schoolData->schoolDatabase());