Skip to content

Commit cdb9600

Browse files
committed
- BugFix: openFile always left a running file manager even after program
close.
1 parent 2064716 commit cdb9600

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
Actions tab shows a counter feedback for inserts (with a plus signal) and
99
removals (with a minus signal) and does not steal focus anymore.
1010
Changed "Sync packages" string to "Check updates".
11+
BugFix: openFile always left a running file manager even after program close.
1112
BugFix: Disable refreshing of Info and File tabs while searching for a pkg.
1213
BugFix: Prefer bash shell when running actions.
1314
BugFix: Disable Info/Files tab refresh while typing in filter/search line edit.

src/wmhelper.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -256,84 +256,84 @@ void WMHelper::openFile(const QString& fileName){
256256
{
257257
s << fileToOpen;
258258
if (UnixCommand::hasTheExecutable(ctn_XFCE_EDITOR))
259-
p->startDetached(ctn_XFCE_EDITOR, s);
259+
p->start(ctn_XFCE_EDITOR, s);
260260
else if (UnixCommand::hasTheExecutable(ctn_XFCE_EDITOR_ALT))
261-
p->startDetached(ctn_XFCE_EDITOR_ALT, s);
261+
p->start(ctn_XFCE_EDITOR_ALT, s);
262262
}
263263
else
264264
{
265265
s << fileToOpen;
266-
p->startDetached(ctn_XFCE_FILE_MANAGER, s);
266+
p->start(ctn_XFCE_FILE_MANAGER, s);
267267
}
268268
}
269269
else if (isKDERunning() && UnixCommand::hasTheExecutable(ctn_KDE_FILE_MANAGER)){
270270
s << "exec";
271271
s << "file:" + fileToOpen;
272-
p->startDetached( ctn_KDE_FILE_MANAGER, s );
272+
p->start( ctn_KDE_FILE_MANAGER, s);
273273
}
274274
else if (UnixCommand::hasTheExecutable(ctn_KDE4_FILE_MANAGER)){
275275
s << fileToOpen;
276-
p->startDetached( getKDEOpenHelper(), s );
276+
p->start( getKDEOpenHelper(), s);
277277
}
278278
else if (isTDERunning() && UnixCommand::hasTheExecutable(ctn_TDE_FILE_MANAGER)){
279279
s << "exec";
280280
s << "file:" + fileToOpen;
281-
p->startDetached( ctn_TDE_FILE_MANAGER, s );
281+
p->start(ctn_TDE_FILE_MANAGER, s);
282282
}
283283
else if (isMATERunning() && UnixCommand::hasTheExecutable(ctn_MATE_FILE_MANAGER)){
284284
s << fileToOpen;
285-
p->startDetached( ctn_MATE_FILE_MANAGER, s );
285+
p->start(ctn_MATE_FILE_MANAGER, s);
286286
}
287287
else if (isCinnamonRunning() && UnixCommand::hasTheExecutable(ctn_CINNAMON_FILE_MANAGER)){
288288
s << fileToOpen;
289-
p->startDetached( ctn_CINNAMON_FILE_MANAGER, s );
289+
p->start(ctn_CINNAMON_FILE_MANAGER, s);
290290
}
291291
else if (isLXQTRunning() && UnixCommand::hasTheExecutable(ctn_LXQT_FILE_MANAGER)){
292292
s << fileToOpen;
293-
p->startDetached( ctn_LXQT_FILE_MANAGER, s );
293+
p->start(ctn_LXQT_FILE_MANAGER, s);
294294
}
295295
else if (isLuminaRunning() && UnixCommand::hasTheExecutable(ctn_LUMINA_OPEN)){
296296
s << fileToOpen;
297-
p->startDetached( ctn_LUMINA_OPEN, s );
297+
p->start(ctn_LUMINA_OPEN, s);
298298
}
299299
else if (UnixCommand::hasTheExecutable(ctn_ARCHBANG_FILE_MANAGER)){
300300
s << fileToOpen;
301-
p->startDetached( ctn_ARCHBANG_FILE_MANAGER, s );
301+
p->start(ctn_ARCHBANG_FILE_MANAGER, s);
302302
}
303303
else if (UnixCommand::hasTheExecutable(ctn_LXQT_FILE_MANAGER)){
304304
s << fileToOpen;
305-
p->startDetached(ctn_LXQT_FILE_MANAGER, s );
305+
p->start(ctn_LXQT_FILE_MANAGER, s);
306306
}
307307
else if (UnixCommand::hasTheExecutable(ctn_LXDE_FILE_MANAGER)){
308308
s << fileToOpen;
309-
p->startDetached( ctn_LXDE_FILE_MANAGER, s );
309+
p->start(ctn_LXDE_FILE_MANAGER, s);
310310
}
311311
else if (UnixCommand::hasTheExecutable(ctn_XFCE_FILE_MANAGER))
312312
{
313313
if (isTextFile)
314314
{
315315
s << fileToOpen;
316316
if (UnixCommand::hasTheExecutable(ctn_XFCE_EDITOR))
317-
p->startDetached(ctn_XFCE_EDITOR, s);
317+
p->start(ctn_XFCE_EDITOR, s);
318318
else if (UnixCommand::hasTheExecutable(ctn_XFCE_EDITOR_ALT))
319-
p->startDetached(ctn_XFCE_EDITOR_ALT, s);
319+
p->start(ctn_XFCE_EDITOR_ALT, s);
320320
}
321321
else
322322
{
323323
s << fileToOpen;
324-
p->startDetached( ctn_XFCE_FILE_MANAGER, s );
324+
p->start( ctn_XFCE_FILE_MANAGER, s);
325325
}
326326
}
327327
else if (UnixCommand::hasTheExecutable(ctn_GNOME_FILE_MANAGER)){
328328
s << fileToOpen;
329329
if (isTextFile)
330-
p->startDetached( ctn_GNOME_EDITOR, s );
330+
p->start(ctn_GNOME_EDITOR, s);
331331
else
332-
p->startDetached( ctn_GNOME_FILE_MANAGER, s );
332+
p->start(ctn_GNOME_FILE_MANAGER, s);
333333
}
334334
else if (UnixCommand::hasTheExecutable(ctn_XDG_OPEN)){
335335
s << fileToOpen;
336-
p->startDetached( ctn_XDG_OPEN, s );
336+
p->start(ctn_XDG_OPEN, s);
337337
}
338338
}
339339

0 commit comments

Comments
 (0)