Don't treat Glib::RefPtr as a regular pointer
git-svn-id: file:///home/vcs/svn/jsweeper/trunk@48 6611ac79-6612-48ef-a1e9-b906f853523emaster
parent
1927203a59
commit
8caa0225c6
|
@ -125,10 +125,10 @@ static void TryLoad(const char *filename)
|
||||||
|
|
||||||
Gui *Gui::Open()
|
Gui *Gui::Open()
|
||||||
{
|
{
|
||||||
if (g_builder == NULL) {
|
if (!g_builder) {
|
||||||
const char * const *dirs = g_get_system_data_dirs();
|
const char * const *dirs = g_get_system_data_dirs();
|
||||||
|
|
||||||
while (*dirs != NULL && g_builder == NULL) {
|
while (*dirs != NULL && !g_builder) {
|
||||||
std::string path = *dirs;
|
std::string path = *dirs;
|
||||||
path = Glib::build_filename(path, PACKAGE_NAME);
|
path = Glib::build_filename(path, PACKAGE_NAME);
|
||||||
path = Glib::build_filename(path, "jsweeper.ui");
|
path = Glib::build_filename(path, "jsweeper.ui");
|
||||||
|
@ -138,9 +138,9 @@ Gui *Gui::Open()
|
||||||
dirs++;
|
dirs++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (g_builder == NULL) TryLoad("jsweeper.ui");
|
if (!g_builder) TryLoad("jsweeper.ui");
|
||||||
|
|
||||||
if (g_builder == NULL) {
|
if (!g_builder) {
|
||||||
std::cerr << "Failed to load jsweeper.ui!" << std::endl;
|
std::cerr << "Failed to load jsweeper.ui!" << std::endl;
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue