e16
/
e16-epplets
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid some crashes on early exit. Cleanups. 

SVN revision: 38413
This commit is contained in:
Kim Woelders 2009-01-01 20:42:28 +00:00
parent 5c6abb57ff
commit 54c47230bf
1 changed files with 18 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
api/epplet.c
View File

@ -1003,62 +1003,23 @@ Epplet_cleanup(void)
{
char s[1024];
#if 0 /* No, I think this causes unintended e16 snaps/respawning */
printf("Epplet_cleanup remember=%d\n", need_remember);
if (need_remember)
Epplet_remember();
#endif
/* remove lock file */
Esnprintf(s, sizeof(s), "%s/.lock_%i", conf_dir, epplet_instance);
if (unlink(s) < 0)
if (conf_dir)
{
char err[255];
/* remove lock file */
Esnprintf(s, sizeof(s), "%s/.lock_%i", conf_dir, epplet_instance);
if (unlink(s) < 0)
{
char err[255];
Esnprintf(err, sizeof(err), "Unable to remove lock file %s -- %s.\n",
s, strerror(errno));
Epplet_dialog_ok(err);
Esnprintf(err, sizeof(err),
"Unable to remove lock file %s -- %s.\n", s,
strerror(errno));
Epplet_dialog_ok(err);
}
}
/* save config settings */
Epplet_save_config();
/* Freeing all this memory right before you exit is pretty pointless.... -- mej */
#if 0
/* free config stuff */
if (config_dict)
{
int i;
for (i = 0; i < config_dict->num_entries; i++)
{
if (config_dict->entries[i].key)
free(config_dict->entries[i].key);
if (config_dict->entries[i].value)
free(config_dict->entries[i].value);
}
free(config_dict->entries);
free(config_dict);
config_dict = NULL;
}
if (conf_dir)
{
free(conf_dir);
conf_dir = NULL;
}
if (epplet_name)
{
free(epplet_name);
epplet_name = NULL;
}
if (epplet_cfg_file)
{
free(epplet_cfg_file);
epplet_cfg_file = NULL;
}
#endif
}
void
@ -1903,7 +1864,7 @@ ECommsSend(char *s)
XEvent ev;
Atom a = 0;
if (!s)
if (!s || !dd)
return;
len = strlen(s);
if (!a)
@ -5565,6 +5526,12 @@ Epplet_dialog_ok(char *text)
{
char *s;
if (!dd)
{
printf("*** %s\n", text);
return;
}
s = malloc(strlen(text) + 32);
sprintf(s, "dialog_ok %s", text);
ECommsSend(s);