shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-02-03 13:47:14 +03:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/v2.0'

Browse Source
This commit is contained in:
Adolfo Gómez García 2016-09-11 22:21:30 +02:00
commit 729b0310bd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actors/src/UDSActorUser.py
View File

@ -33,8 +33,8 @@
from __future__ import unicode_literals
import sys
from PyQt4 import QtGui
from PyQt4 import QtCore
from PyQt4 import QtGui # @UnresolvedImport
from PyQt4 import QtCore # @UnresolvedImport
import pickle
import time
import datetime

2
server/src/uds/osmanagers/LinuxOsManager/LinuxOsManager.py
View File

@ -204,7 +204,7 @@ class LinuxOsManager(osmanagers.OSManager):
'''
On production environments, will return no idle for non removable machines
'''
if self._idle <= 0 or (settings.DEBUG is False and self._onLogout != 'remove'):
if self._idle <= 0: # or (settings.DEBUG is False and self._onLogout != 'remove'):
return None
return self._idle

2
server/src/uds/osmanagers/WindowsOsManager/WindowsOsManager.py
View File

@ -239,7 +239,7 @@ class WindowsOsManager(osmanagers.OSManager):
'''
On production environments, will return no idle for non removable machines
'''
if self._idle <= 0 or (settings.DEBUG is False and self._onLogout != 'remove'):
if self._idle <= 0: # or (settings.DEBUG is False and self._onLogout != 'remove'):
return None
return self._idle